Encapsulated msg_location inside msg_emit

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

diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index 6bc8344a4d06bfb40b3b21a8d46fe8057366a9b3..fe16c6b22bf72e4972f96632d95208133b5933bc 100644 (file)
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   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
@@ -36,7 +36,9 @@
 static char *command_name;
 
 /* Message handler as set by msg_init(). */
-static void (*msg_handler) (const struct msg *);
+static void (*msg_handler)  (const struct msg *);
+static void (*msg_location) (struct msg_locator *);
+
 
 /* Public functions. */
 
@@ -50,7 +52,6 @@ msg (enum msg_class class, const char *format, ...)
 
   m.category = msg_class_to_category (class);
   m.severity = msg_class_to_severity (class);
-  msg_location (&m.where);
   va_start (args, format);
   m.text = xvasprintf (format, args);
   va_end (args);
@@ -59,9 +60,11 @@ msg (enum msg_class class, const char *format, ...)
 }
 
 void
-msg_init (void (*handler) (const struct msg *)) 
+msg_init ( void (*handler) (const struct msg *), 
+          void (*location) (struct msg_locator *) ) 
 {
   msg_handler = handler;
+  msg_location = location;
 }
 
 void
@@ -95,6 +98,7 @@ msg_destroy(struct msg *m)
 void
 msg_emit (struct msg *m) 
 {
+  msg_location (&m->where);
   msg_handler (m);
   free (m->text);
 }
@@ -137,7 +141,6 @@ request_bug_report_and_abort(const char *msg )
          "build_system:        %s\n"
          "default_config_path: %s\n"
          "include_path:        %s\n"
-         "groff_font_path:     %s\n"
          "locale_dir:          %s\n"
          "compiler version:    %s\n"
          ,
@@ -149,7 +152,6 @@ request_bug_report_and_abort(const char *msg )
          build_system,
          default_config_path,
          include_path, 
-         groff_font_path,
          locale_dir,
 #ifdef __VERSION__
          __VERSION__