X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.c;h=80ddef88691169f3913ef1b09202a07d47c483c1;hb=a7fb79e81f6e2a0dfddc61e91f207609e31a4632;hp=eaad1a69f3e596d612b7e97eb0a9e547324ae8df;hpb=97d4f38945476834fd7fce612b663f19f2b291f8;p=pspp

diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index eaad1a69f3..80ddef8869 100644
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -19,8 +18,10 @@
 
 #include <config.h>
 
-#include <libpspp/message.h>
+#include "message.h"
+#include "msg-locator.h"
 
+#include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,8 +39,9 @@ static char *command_name;
 
 /* Message handler as set by msg_init(). */
 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. */
 
@@ -60,12 +62,13 @@ msg (enum msg_class class, const char *format, ...)
   msg_emit (&m);
 }
 
+static struct source_stream *s_stream;
+
 void
-msg_init ( void (*handler) (const struct msg *), 
-	   void (*location) (struct msg_locator *) ) 
+msg_init (struct source_stream *ss,  void (*handler) (const struct msg *) )
 {
+  s_stream = ss;
   msg_handler = handler;
-  msg_location = location;
 }
 
 void
@@ -93,16 +96,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);
+  get_msg_location (s_stream, &m->where);
+  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--;
+}
 
 /* Private functions. */