Work on DEFINE command.

[pspp] / src / libpspp / message.h

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 32342f40e993501c56ba7e3245f5e45866b3acad..ebd788aecd2ec725fa5096e54c2e6d8ee5011109 100644 (file)
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011, 2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -75,6 +75,7 @@ struct msg
     enum msg_category category; /* Message category. */
     enum msg_severity severity; /* Message severity. */
     char *file_name;            /* Name of file containing error, or NULL. */
+    char *command_name;         /* Name of erroneous command, or NULL.  */
     int first_line;             /* 1-based line number, or 0 if none. */
     int last_line;             /* 1-based exclusive last line (0=none). */
     int first_column;           /* 1-based first column, or 0 if none. */
@@ -90,14 +91,17 @@ void msg_set_handler (void (*handler) (const struct msg *, void *lexer),
 /* Working with messages. */
 struct msg *msg_dup (const struct msg *);
 void msg_destroy(struct msg *);
-char *msg_to_string (const struct msg *, const char *command_name);
+char *msg_to_string (const struct msg *);
 
 /* Emitting messages. */
+void vmsg (enum msg_class class, const char *format, va_list args)
+     PRINTF_FORMAT (2, 0);
 void msg (enum msg_class, const char *format, ...)
      PRINTF_FORMAT (2, 3);
 void msg_emit (struct msg *);
 
-void msg_error (int errnum, const char *format, ...);
+void msg_error (int errnum, const char *format, ...)
+  PRINTF_FORMAT (2, 3);
 
 
 /* Enable and disable messages. */
@@ -112,6 +116,8 @@ void msg_ui_disable_warnings (bool);
 
 
 /* Used in panic situations only. */
+const char * prepare_diagnostic_information (void);
+const char * prepare_fatal_error_message (void);
 void request_bug_report (const char *msg);