X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2F_PDCLIB%2Fassert.c;h=f4d2cbc2a0511f00bd8030ce43dec5f0d064a2b9;hp=5c4b310936ac4dcf3eacd2cdcb43adb48d12149b;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=c7a9c2e3a08068d6b10656c0d3ba683f6ec74fa9

diff --git a/functions/_PDCLIB/assert.c b/functions/_PDCLIB/assert.c
index 5c4b310..f4d2cbc 100644
--- a/functions/_PDCLIB/assert.c
+++ b/functions/_PDCLIB/assert.c
@@ -1,7 +1,3 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
 /* _PDCLIB_assert( char const * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,47 +6,45 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 
-#ifndef _PDCLIB_AUX_H
-#define _PDCLIB_AUX_H _PDCLIB_AUX_H
-#include <_PDCLIB_aux.h>
-#endif
+#ifndef REGTEST
 
-#if _PDCLIB_C_VERSION == 99
-void _PDCLIB_assert( char const * const message1, char const * const function, char const * const message2 )
+#include "_PDCLIB_aux.h"
+
+void _PDCLIB_assert99( char const * const message1, char const * const function, char const * const message2 )
 {
     fputs( message1, stderr );
     fputs( function, stderr );
     fputs( message2, stderr );
     abort();
 }
-#else
-void _PDCLIB_assert( char const * const message )
+
+void _PDCLIB_assert89( char const * const message )
 {
     fputs( message, stderr );
     abort();
 }
-#endif
 
+#endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 #include <signal.h>
 
-static int rc = 0;
 static int EXPECTED_ABORT = 0;
 static int UNEXPECTED_ABORT = 1;
 
-void aborthandler( int signal )
+static void aborthandler( int sig )
 {
     TESTCASE( ! EXPECTED_ABORT );
-    exit( rc );
+    exit( (signed int)TEST_RESULTS );
 }
 
 #define NDEBUG
 #include <assert.h>
 
-int disabled_test()
+static int disabled_test( void )
 {
     int i = 0;
     assert( i == 0 ); /* NDEBUG set, condition met */
@@ -61,10 +55,10 @@ int disabled_test()
 #undef NDEBUG
 #include <assert.h>
 
-int main()
+int main( void )
 {
-    BEGIN_TESTS;
     TESTCASE( signal( SIGABRT, &aborthandler ) != SIG_ERR );
+    TESTCASE( disabled_test() == 0 );
     assert( UNEXPECTED_ABORT ); /* NDEBUG not set, condition met */
     assert( EXPECTED_ABORT ); /* NDEBUG not set, condition fails - should abort */
     return TEST_RESULTS;