X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.h;h=ebd788aecd2ec725fa5096e54c2e6d8ee5011109;hb=e71b8fcc7e866cb0b123b1b00070f5442903834b;hp=5ced994ad52c7db1c7a70919d8422b0536f5d67d;hpb=9ade26c8349b4434008c46cf09bc7473ec743972;p=pspp

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 5ced994ad5..ebd788aecd 100644
--- 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
@@ -39,6 +39,8 @@ enum msg_severity
     MSG_N_SEVERITIES
   };
 
+const char *msg_severity_to_string (enum msg_severity);
+
 /* Combination of a category and a severity for convenience. */
 enum msg_class
   {
@@ -73,15 +75,15 @@ 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. */
     int last_column;            /* 1-based exclusive last column (0=none). */
     char *text;                 /* Error text. */
+    bool shipped;               /* True if this message has been emitted */
   };
 
-struct source_stream ;
-
 /* Initialization. */
 void msg_set_handler (void (*handler) (const struct msg *, void *lexer),
                       void *aux);
@@ -89,13 +91,19 @@ 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, ...)
+  PRINTF_FORMAT (2, 3);
+
+
 /* Enable and disable messages. */
 void msg_enable (void);
 void msg_disable (void);
@@ -108,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);