Fallback to static array as pre-main malloc() created problems. (_start calls atexit...

[pdclib] / functions / stdlib / exit.c

diff --git a/functions/stdlib/exit.c b/functions/stdlib/exit.c
index 5cb2a508fe19838baa4e9e95f08707af90e671c4..0d816a3bba1a6ecd9b9b867bfc0fbe4ab0d22479 100644 (file)
--- a/functions/stdlib/exit.c
+++ b/functions/stdlib/exit.c
@@ -12,19 +12,24 @@
 
 #ifndef REGTEST
 
-struct _PDCLIB_exitfunc_t * regstack = NULL;
+/* TODO - "except that a function is called after any previously registered
+   functions that had already been called at the time it was registered.
+*/
+
+/* TODO: 32 is guaranteed. This should be dynamic but ATM gives problems
+   with my malloc.
+*/
+#define NUMBER_OF_SLOTS 40
+
+void (*_PDCLIB_regstack[ NUMBER_OF_SLOTS ])( void );
+size_t _PDCLIB_regptr = NUMBER_OF_SLOTS;
 
 void exit( int status )
 {
-    struct _PDCLIB_exitfunc_t * next = regstack;
-    while ( next != NULL )
+    while ( _PDCLIB_regptr < NUMBER_OF_SLOTS )
     {
-        next->func();
-        regstack = next->next;
-        free( next );
-        next = regstack;
+        _PDCLIB_regstack[ _PDCLIB_regptr++ ]();
     }
-    /* TODO: Flush and close open streams. Remove tmpfile() files. */
     _Exit( status );
 }
 
@@ -36,7 +41,7 @@ void exit( int status )
 int main()
 {
     BEGIN_TESTS;
-    TESTCASE( NO_TESTDRIVER );
+    /* Unwinding of regstack tested in atexit(). */
     return TEST_RESULTS;
 }