github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2026-09-18 06:33:46 +00:00
Code Releases Wiki Activity

- Fixed another interesting bug in the OS4 destructor code.

Browse Source 
git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@14877 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2005-03-10 13:30:11 +00:00
parent 9a7c8a8705
commit 59d7f8d07f
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/crtbegin.c
+11 -13
View File
@@ -1,5 +1,5 @@
/* /*
* $Id: crtbegin.c,v 1.7 2005-03-10 13:28:05 obarthel Exp $ * $Id: crtbegin.c,v 1.8 2005-03-10 13:30:11 obarthel Exp $
* *
* :ts=4 * :ts=4
* *
@@ -33,16 +33,14 @@ static void (*__DTOR_LIST__[1]) (void) __attribute__(( used, section(".dtors"),
void void
_init(void) _init(void)
{ {
int num_ctors; int num_ctors,i;
int i; int j;
num_ctors = 0; for(i = 1, num_ctors = 0 ; __CTOR_LIST__[i] != NULL ; i++)
for(i = 1 ; __CTOR_LIST__[i] != NULL ; i++)
num_ctors++; num_ctors++;
for(i = 0 ; i < num_ctors ; i++) for(j = 0 ; j < num_ctors ; j++)
__CTOR_LIST__[num_ctors - i](); __CTOR_LIST__[num_ctors - j]();
} }
/****************************************************************************/ /****************************************************************************/
@@ -52,19 +50,19 @@ _fini(void)
{ {
extern jmp_buf __exit_jmp_buf; extern jmp_buf __exit_jmp_buf;
int num_dtors,j; int num_dtors,i;
static int i; static int j;
/* If one of the destructors drops into /* If one of the destructors drops into
exit(), processing will continue with exit(), processing will continue with
the next following destructor. */ the next following destructor. */
(void)setjmp(__exit_jmp_buf); (void)setjmp(__exit_jmp_buf);
for(j = 0, num_dtors = 0 ; __DTOR_LIST__[j] != NULL ; j++) for(i = 1, num_dtors = 0 ; __DTOR_LIST__[i] != NULL ; i++)
num_dtors++; num_dtors++;
while(i++ < num_dtors) while(j++ < num_dtors)
__DTOR_LIST__[i](); __DTOR_LIST__[j]();
} }
/****************************************************************************/ /****************************************************************************/