Move MX* processing to libpspp/message.c

This change moves the guts of src/ui/terminal/msg-ui.c
into libpspp/message.c  The affected code handles the
processing of the MXWARNS and MXERRS settings.  As this
code was under src/ui/terminal these settings were being
ignored in the GUI

diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index c227a60368a0ff725dacc9baba4e00bf916cf37d..0d226a1732ed45a2825ac02ce263780f769947ee 100644 (file)
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -28,6 +28,7 @@
 
 #include <libpspp/str.h>
 #include <libpspp/version.h>
+#include <data/settings.h>
 
 #include "gl/progname.h"
 #include "gl/xalloc.h"
@@ -145,6 +146,93 @@ msg_to_string (const struct msg *m, const char *command_name)
   return ds_cstr (&s);
 }
 \f
+
+/* Number of messages reported, by severity level. */
+static int counts[MSG_N_SEVERITIES];
+
+/* True after the maximum number of errors or warnings has been exceeded. */
+static bool too_many_errors;
+
+/* True after the maximum number of notes has been exceeded. */
+static bool too_many_notes;
+
+/* Checks whether we've had so many errors that it's time to quit
+   processing this syntax file. */
+bool
+msg_ui_too_many_errors (void)
+{
+  return too_many_errors;
+}
+
+void
+msg_ui_reset_counts (void)
+{
+  int i;
+
+  for (i = 0; i < MSG_N_SEVERITIES; i++)
+    counts[i] = 0;
+  too_many_errors = false;
+  too_many_notes = false;
+}
+
+bool
+msg_ui_any_errors (void)
+{
+  return counts[MSG_S_ERROR] > 0;
+}
+
+static void
+submit_note (char *s)
+{
+  struct msg m;
+
+  m.category = MSG_C_GENERAL;
+  m.severity = MSG_S_NOTE;
+  m.where.file_name = NULL;
+  m.where.line_number = -1;
+  m.text = s;
+  msg_handler (&m);
+  free (s);
+}
+
+static void
+process_msg (const struct msg *m)
+{
+  int n_msgs, max_msgs;
+
+  if (too_many_errors || (too_many_notes && m->severity == MSG_S_NOTE))
+    return;
+
+  msg_handler (m);
+
+  counts[m->severity]++;
+  max_msgs = settings_get_max_messages (m->severity);
+  n_msgs = counts[m->severity];
+  if (m->severity == MSG_S_WARNING)
+    n_msgs += counts[MSG_S_ERROR];
+  if (n_msgs > max_msgs)
+    {
+      if (m->severity == MSG_S_NOTE)
+        {
+          too_many_notes = true;
+          submit_note (xasprintf (_("Notes (%d) exceed limit (%d).  "
+                                    "Suppressing further notes."),
+                                  n_msgs, max_msgs));
+        }
+      else
+        {
+          too_many_errors = true;
+          if (m->severity == MSG_S_WARNING)
+            submit_note (xasprintf (_("Warnings (%d) exceed limit (%d)."),
+                                    n_msgs, max_msgs));
+          else
+            submit_note (xasprintf (_("Errors (%d) exceed limit (%d)."),
+                                    n_msgs, max_msgs));
+        }
+    }
+}
+
+
 /* Emits M as an error message.
    Frees allocated data in M. */
 void
@@ -159,7 +247,8 @@ msg_emit (struct msg *m)
     }
 
   if (!messages_disabled)
-     msg_handler (m);
+     process_msg (m);
+
   free (m->text);
 }
 
@@ -209,3 +298,4 @@ request_bug_report_and_abort (const char *msg)
 
   _exit (EXIT_FAILURE);
 }
+

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index e1fc4f5aab1235459b075ddf92e2c704c4561d62..cf297ae324babc5bbbd9ee26cc3e5bb17b6f1cb5 100644 (file)
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -112,4 +112,8 @@ void msg_pop_msg_locator (const struct msg_locator *);
 /* Used in panic situations only. */
 void request_bug_report_and_abort (const char *msg) NO_RETURN;
 
+bool msg_ui_too_many_errors (void);
+void msg_ui_reset_counts (void);
+bool msg_ui_any_errors (void);
+
 #endif /* message.h */

diff --git a/src/ui/terminal/msg-ui.c b/src/ui/terminal/msg-ui.c
index c657f096f3c16d9679f3bfafff44fa57017d2994..63682d18e0a36e741af9036a958ec966384a66bb 100644 (file)
--- a/src/ui/terminal/msg-ui.c
+++ b/src/ui/terminal/msg-ui.c
@@ -16,41 +16,16 @@
 
 #include <config.h>
 
-#include "ui/terminal/msg-ui.h"
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "data/settings.h"
-#include "libpspp/getl.h"
+#include "msg-ui.h"
 #include "libpspp/message.h"
 #include "libpspp/msg-locator.h"
-#include "libpspp/str.h"
-#include "output/journal.h"
-#include "output/driver.h"
-#include "output/tab.h"
 #include "output/message-item.h"
 
-#include "gl/unilbrk.h"
-#include "gl/localcharset.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-/* Number of messages reported, by severity level. */
-static int counts[MSG_N_SEVERITIES];
-
-/* True after the maximum number of errors or warnings has been exceeded. */
-static bool too_many_errors;
-
-/* True after the maximum number of notes has been exceeded. */
-static bool too_many_notes;
-
-static void handle_msg (const struct msg *);
+static void
+handle_msg (const struct msg *m)
+{
+  message_item_submit (message_item_create (m));
+}
 
 void
 msg_ui_init (struct source_stream *ss)
@@ -64,79 +39,3 @@ msg_ui_done (void)
   msg_done ();
   msg_locator_done ();
 }
-
-/* Checks whether we've had so many errors that it's time to quit
-   processing this syntax file. */
-bool
-msg_ui_too_many_errors (void)
-{
-  return too_many_errors;
-}
-
-void
-msg_ui_reset_counts (void)
-{
-  int i;
-
-  for (i = 0; i < MSG_N_SEVERITIES; i++)
-    counts[i] = 0;
-  too_many_errors = false;
-  too_many_notes = false;
-}
-
-bool
-msg_ui_any_errors (void)
-{
-  return counts[MSG_S_ERROR] > 0;
-}
-
-static void
-submit_note (char *s)
-{
-  struct msg m;
-
-  m.category = MSG_C_GENERAL;
-  m.severity = MSG_S_NOTE;
-  m.where.file_name = NULL;
-  m.where.line_number = -1;
-  m.text = s;
-  message_item_submit (message_item_create (&m));
-  free (s);
-}
-
-static void
-handle_msg (const struct msg *m)
-{
-  int n_msgs, max_msgs;
-
-  if (too_many_errors || (too_many_notes && m->severity == MSG_S_NOTE))
-    return;
-
-  message_item_submit (message_item_create (m));
-
-  counts[m->severity]++;
-  max_msgs = settings_get_max_messages (m->severity);
-  n_msgs = counts[m->severity];
-  if (m->severity == MSG_S_WARNING)
-    n_msgs += counts[MSG_S_ERROR];
-  if (n_msgs > max_msgs)
-    {
-      if (m->severity == MSG_S_NOTE)
-        {
-          too_many_notes = true;
-          submit_note (xasprintf (_("Notes (%d) exceed limit (%d).  "
-                                    "Suppressing further notes."),
-                                  n_msgs, max_msgs));
-        }
-      else
-        {
-          too_many_errors = true;
-          if (m->severity == MSG_S_WARNING)
-            submit_note (xasprintf (_("Warnings (%d) exceed limit (%d)."),
-                                    n_msgs, max_msgs));
-          else
-            submit_note (xasprintf (_("Errors (%d) exceed limit (%d)."),
-                                    n_msgs, max_msgs));
-        }
-    }
-}

diff --git a/src/ui/terminal/msg-ui.h b/src/ui/terminal/msg-ui.h
index 2c08a8822aa4f9948da02f8b13f466882dca76d1..197d7c0273597d2e48045487c684c82841cb6132 100644 (file)
--- a/src/ui/terminal/msg-ui.h
+++ b/src/ui/terminal/msg-ui.h
@@ -25,8 +25,5 @@ struct source_stream;
 void msg_ui_set_error_file (FILE *);
 void msg_ui_init (struct source_stream *);
 void msg_ui_done (void);
-bool msg_ui_too_many_errors (void);
-void msg_ui_reset_counts (void);
-bool msg_ui_any_errors (void);
 
 #endif /* msg-ui.h */