X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdlib%2Fatexit.c;h=8a5f4d7b4db74adc01e9a4e4f699a776060625a3;hb=12e17136786afb1775c9dc946cbe41f5e230c24a;hp=573e4ba68bf706590b71e377ba0e21cbf45eae46;hpb=d19e2e0c6595c2365e55a57a2e9a6cd0b13262c7;p=pdclib.old

diff --git a/functions/stdlib/atexit.c b/functions/stdlib/atexit.c
index 573e4ba..8a5f4d7 100644
--- a/functions/stdlib/atexit.c
+++ b/functions/stdlib/atexit.c
@@ -12,27 +12,18 @@
 
 #ifndef REGTEST
 
-/* TODO: Required by both atexit() and exit(). */
-struct _PDCLIB_exitfunc_t
-{
-    struct _PDCLIB_exitfunc_t * next;
-    void (*func)( void );
-};
-
-extern struct _PDCLIB_exitfunc_t * regstack;
+extern void (*_PDCLIB_regstack[])( void );
+extern size_t _PDCLIB_regptr;
 
 int atexit( void (*func)( void ) )
 {
-    struct _PDCLIB_exitfunc_t * regfunc = (struct _PDCLIB_exitfunc_t *)malloc( sizeof( struct _PDCLIB_exitfunc_t ) );
-    if ( regfunc == NULL )
+    if ( _PDCLIB_regptr == 0 )
     {
         return -1;
     }
     else
     {
-        regfunc->func = func;
-	regfunc->next = regstack;
-	regstack = regfunc;
+        _PDCLIB_regstack[ --_PDCLIB_regptr ] = func;
 	return 0;
     }
 }
@@ -41,12 +32,32 @@ int atexit( void (*func)( void ) )
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
+#include <assert.h>
 
-int main()
+static int flags[ 32 ];
+
+static void counthandler( void )
 {
-    int NO_TESTDRIVER = 0;
-    BEGIN_TESTS;
-    TESTCASE( NO_TESTDRIVER );
+    static int count = 0;
+    flags[ count ] = count;
+    ++count;
+}
+
+static void checkhandler( void )
+{
+    for ( int i = 0; i < 31; ++i )
+    {
+        assert( flags[ i ] == i );
+    }
+}
+
+int main( void )
+{
+    TESTCASE( atexit( &checkhandler ) == 0 );
+    for ( int i = 0; i < 31; ++i )
+    {
+        TESTCASE( atexit( &counthandler ) == 0 );
+    }
     return TEST_RESULTS;
 }