Patch #5244.

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

diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index eaad1a69f3e596d612b7e97eb0a9e547324ae8df..1a4601fc18981b55bf3ed9f1422b1478d872e8ac 100644 (file)
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -21,6 +21,7 @@
 
 #include <libpspp/message.h>
 
+#include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,6 +42,9 @@ static void (*msg_handler)  (const struct msg *);
 static void (*msg_location) (struct msg_locator *);
 
 
+/* Disables emitting messages if positive. */
+static int messages_disabled;
+
 /* Public functions. */
 
 /* Writes error message in CLASS, with text FORMAT, formatted with
@@ -93,16 +97,34 @@ msg_destroy(struct msg *m)
   free(m);
 }
 
-
 /* Emits M as an error message.
    Frees allocated data in M. */
 void
 msg_emit (struct msg *m) 
 {
   msg_location (&m->where);
-  msg_handler (m);
+  if (!messages_disabled)
+    msg_handler (m);
   free (m->text);
 }
+
+/* Disables message output until the next call to msg_enable.  If
+   this function is called multiple times, msg_enable must be
+   called an equal number of times before messages are actually
+   re-enabled. */
+void
+msg_disable (void) 
+{
+  messages_disabled++;
+}
+
+/* Enables message output that was disabled by msg_disable. */
+void
+msg_enable (void) 
+{
+  assert (messages_disabled > 0);
+  messages_disabled--;
+}
 \f
 /* Private functions. */