Patch #5244.

[pspp-builds.git] / src / libpspp / message.h

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 0cf6739941ba3edbf39102223435f0823562d380..e345ea655132858d34a4f708e5b9f737b00aee5d 100644 (file)
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -85,46 +85,32 @@ struct msg
     char *text;                 /* Error text. */
   };
 
-/* Number of errors, warnings reported. */
-extern int err_error_count;
-extern int err_warning_count;
-
-/* If number of allowable errors/warnings is exceeded, then a message
-   is displayed and this flag is set to suppress subsequent
-   messages. */
-extern int err_already_flagged;
-
-/* Nonnegative verbosity level.  Higher value == more verbose. */
-extern int err_verbosity;
-
 /* Initialization. */
+void msg_init ( void (*handler) (const struct msg *), 
+               void (*location) (struct msg_locator *) ) ;
+
 void msg_done (void);
 
+struct msg * msg_dup(const struct msg *m);
+void msg_destroy(struct msg *m);
+
 /* Emitting messages. */
 void msg (enum msg_class, const char *format, ...)
      PRINTF_FORMAT (2, 3);
-void msg_emit (const struct msg *);
+void msg_emit (struct msg *);
 
-void verbose_msg (int level, const char *format, ...)
-     PRINTF_FORMAT (2, 3);
+/* Enable and disable messages. */
+void msg_enable (void);
+void msg_disable (void);
 
 /* Error context. */
 void msg_set_command_name (const char *);
+const char *msg_get_command_name (void);
 void msg_push_msg_locator (const struct msg_locator *);
 void msg_pop_msg_locator (const struct msg_locator *);
-void msg_location (struct msg_locator *);
-void err_check_count (void);
-
-/* Used in panic situations only. */
-void request_bug_report_and_abort (const char *msg);
 
-void msg_assert_fail (const char *expr, const char *file, int line);
 
-#undef __STRING
-#define __STRING(x) #x
-#undef assert
-                              
-#define assert(expr) ( (void) ( expr ? (void) 0 : \
-              msg_assert_fail(__STRING(expr), __FILE__, __LINE__)) )
+/* Used in panic situations only. */
+void request_bug_report_and_abort (const char *msg) NO_RETURN;
 
 #endif /* message.h */