replace ASSERT macro with standard assert

The standard libc assert is more familiar to programmers, renders more useful
debugging messages, and is more easily toggled with NDEBUG.

diff --git a/lib/sfio/sfclose.c b/lib/sfio/sfclose.c
index c9408834bd016257f1265cbcc486042d6100ce03..27cac9aa760b8ac6d31f627f2b49ab9439ac2611 100644 (file)
--- a/lib/sfio/sfclose.c
+++ b/lib/sfio/sfclose.c
@@ -8,6 +8,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#include       <assert.h>
 #include       <sfio/sfhdr.h>
 #include       <stddef.h>
 
@@ -74,7 +75,7 @@ int sfclose(Sfio_t * f)
            }
        } else {
            f->mode &= ~SF_LOCK;
-           /**/ ASSERT(_Sfpmove);
+           assert(_Sfpmove);
            if ((*_Sfpmove) (f, -1) < 0) {
                SFOPEN(f, 0);
                SFMTXRETURN(f, -1);

diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index 2f84fd5ee7f5abd4d9b7e900838602804216b6ca..863bb9dde767b0848f5ca6542ccebbd145e99ff4 100644 (file)
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -115,12 +115,6 @@ extern "C" {
 #define SF_AVAIL       00020000u       /* was closed, available for reuse      */
 #define SF_LOCAL       00100000u       /* sentinel for a local call            */
 
-#ifdef DEBUG
-#define ASSERT(p)      ((p) ? 0 : (abort(),0) )
-#else
-#define ASSERT(p)
-#endif
-
 /* short-hands */
 #define NIL(t)         ((t)0)
 #ifndef uchar