X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.h;h=be4ba3e21dcba2f25e68aa98a3f1674d97dc13d9;hb=d3ceb500f824c3765b424e69c69cf3eb85117d15;hp=9f037cb264d80683c54f8377c56a5e5254b9f1a2;hpb=618a58ebb4c59dff83374278e44b7375b3865935;p=pspp-builds.git

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 9f037cb2..be4ba3e2 100644
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    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
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef MESSAGE_H
 #define MESSAGE_H 1
@@ -25,7 +22,7 @@
 #include <libpspp/compiler.h>
 
 /* What kind of message is this? */
-enum msg_category 
+enum msg_category
   {
     MSG_GENERAL,        /* General info. */
     MSG_SYNTAX,         /* Messages that relate to syntax files. */
@@ -33,7 +30,7 @@ enum msg_category
   };
 
 /* How important a condition is it? */
-enum msg_severity 
+enum msg_severity
   {
     MSG_ERROR,
     MSG_WARNING,
@@ -51,20 +48,20 @@ enum msg_class
 
 
 static inline enum msg_category
-msg_class_to_category (enum msg_class class) 
+msg_class_to_category (enum msg_class class)
 {
   return class / 3;
 }
 
 static inline enum msg_severity
-msg_class_to_severity (enum msg_class class) 
+msg_class_to_severity (enum msg_class class)
 {
   return class % 3;
 }
 
 static inline enum msg_class
 msg_class_from_category_and_severity (enum msg_category category,
-                                      enum msg_severity severity) 
+                                      enum msg_severity severity)
 {
   return category * 3 + severity;
 }
@@ -85,9 +82,10 @@ struct msg
     char *text;                 /* Error text. */
   };
 
+struct source_stream ;
+
 /* Initialization. */
-void msg_init ( void (*handler) (const struct msg *), 
-		void (*location) (struct msg_locator *) ) ;
+void msg_init (struct source_stream *, void (*handler) (const struct msg *) );
 
 void msg_done (void);
 
@@ -99,6 +97,10 @@ void msg (enum msg_class, const char *format, ...)
      PRINTF_FORMAT (2, 3);
 void msg_emit (struct msg *);
 
+/* Enable and disable messages. */
+void msg_enable (void);
+void msg_disable (void);
+
 /* Error context. */
 void msg_set_command_name (const char *);
 const char *msg_get_command_name (void);
@@ -107,15 +109,6 @@ void msg_pop_msg_locator (const struct msg_locator *);
 
 
 /* Used in panic situations only. */
-void request_bug_report_and_abort (const char *msg);
-
-void msg_assert_fail (const char *expr, const char *file, int line);
-
-#undef __STRING
-#define __STRING(x) #x
-#undef assert
-			       
-#define assert(expr) ( (void) ( expr ? (void) 0 : \
-	       msg_assert_fail(__STRING(expr), __FILE__, __LINE__)) )
+void request_bug_report_and_abort (const char *msg) NO_RETURN;
 
 #endif /* message.h */