(struniq_assert): Now returns void, and aborts if the assertion is false.

diff --git a/src/struniq.c b/src/struniq.c
index e593a4d36255cd3622963239dc81dfced432f4e0..a42f78629b29df349056363489bb7e10c6f50fd6 100644 (file)
--- a/src/struniq.c
+++ b/src/struniq.c
@@ -51,21 +51,17 @@ struniq_new (const char *s)
 }
 
 
 }
 
 

-/*---------------------------------.
-| Return TRUE iff S is a struniq.  |
-`---------------------------------*/
+/*------------------------------.
+| Abort if S is not a struniq.  |
+`------------------------------*/

 
 

-bool
-struniq_assert_p (const char *s)
+void
+struniq_assert (const char *s)

 {
   if (!hash_lookup (struniqs_table, s))
     {
       error (0, 0, "not a struniq: %s", quotearg (s));
 {
   if (!hash_lookup (struniqs_table, s))
     {
       error (0, 0, "not a struniq: %s", quotearg (s));

-      return false;
-    }
-  else
-    {
-      return true;
+      abort ();

     }
 }
 
     }
 }
 

diff --git a/src/struniq.h b/src/struniq.h
index adaee5d932c8968087535c50dc3072b8cce341bc..f72116c34b8c435e836e2c88c1f89468a60282ec 100644 (file)
--- a/src/struniq.h
+++ b/src/struniq.h
@@ -41,8 +41,7 @@ struniq_t struniq_new (const char *s);
 void struniqs_new (void);
 
 /* Die if S is not a struniq.  */
 void struniqs_new (void);
 
 /* Die if S is not a struniq.  */

-#define struniq_assert(S) assert (struniq_assert_p (S));
-bool struniq_assert_p (const char *s);
+void struniq_assert (const char *s);

 
 /* Free all the memory allocated for symbols.  */
 void struniqs_free (void);
 
 /* Free all the memory allocated for symbols.  */
 void struniqs_free (void);