X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdlib%2Fatexit.c;h=3184fcd166cfcc081277d89381077b62105f89a2;hb=c510d64eb2b5d70547b4d36f35ebd12809aabd32;hp=52df21c22c1991ff523ec2d3e44e1d787141de79;hpb=492cae1767efcce269e5472dcf0a18e6abf546a1;p=pdclib

diff --git a/functions/stdlib/atexit.c b/functions/stdlib/atexit.c
index 52df21c..3184fcd 100644
--- a/functions/stdlib/atexit.c
+++ b/functions/stdlib/atexit.c
@@ -1,7 +1,3 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
 /* atexit( void (*)( void ) )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -12,21 +8,19 @@
 
 #ifndef REGTEST
 
-extern struct _PDCLIB_exitfunc_t * regstack;
+extern void (*_PDCLIB_exitstack[])( void );
+extern size_t _PDCLIB_exitptr;
 
 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_exitptr == 0 )
     {
         return -1;
     }
     else
     {
-        regfunc->func = func;
-	regfunc->next = regstack;
-	regstack = regfunc;
-	return 0;
+        _PDCLIB_exitstack[ --_PDCLIB_exitptr ] = func;
+        return 0;
     }
 }
 
@@ -34,11 +28,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 )
 {
-    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;
 }