Make CANT_HAPPEN() more obvious for static analysis

[empserver] / include / misc.h

diff --git a/include/misc.h b/include/misc.h
index 32817f825fa9866d85fdd49a425c13a6c9c6aad4..8c4095b558c0dd64d1e3b37c6a0120adfa46858e 100644 (file)
--- a/include/misc.h
+++ b/include/misc.h
@@ -70,15 +70,15 @@
  * Return EXPR != 0.
  * Usage: if (CANT_HAPPEN(...)) <recovery code>;
  */
-#define CANT_HAPPEN(expr) ((expr) ? oops(#expr, __FILE__, __LINE__) : 0)
+#define CANT_HAPPEN(expr) ((expr) ? oops(#expr, __FILE__, __LINE__), 1 : 0)
 
 /*
  * Report internal error.
  * Usage: CANT_REACH(); <recovery code>;
  */
-#define CANT_REACH() (void)oops(NULL, __FILE__, __LINE__)
+#define CANT_REACH() oops(NULL, __FILE__, __LINE__)
 
-extern int oops(char *, char *, int);
+extern void oops(char *, char *, int);
 extern void (*oops_handler)(void);
 
 void exit_nomem(void) ATTRIBUTE((noreturn));