X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.c;h=227109145528d318f3963e7b3e295d11ef8602e9;hb=97e2b765b9b3cb25c85c5a6b0727d66e481411b1;hp=80ddef88691169f3913ef1b09202a07d47c483c1;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index 80ddef8869..2271091455 100644
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006 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 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 . */
#include
@@ -28,10 +26,10 @@
#include
#include
-#include
#include
#include "progname.h"
+#include "xalloc.h"
#include "xvasprintf.h"
/* Current command name as set by msg_set_command_name(). */
@@ -72,13 +70,13 @@ msg_init (struct source_stream *ss, void (*handler) (const struct msg *) )
}
void
-msg_done (void)
+msg_done (void)
{
}
/* Duplicate a message */
-struct msg *
+struct msg *
msg_dup(const struct msg *m)
{
struct msg *new_msg = xmalloc (sizeof *m);
@@ -99,11 +97,13 @@ msg_destroy(struct msg *m)
/* Emits M as an error message.
Frees allocated data in M. */
void
-msg_emit (struct msg *m)
+msg_emit (struct msg *m)
{
- get_msg_location (s_stream, &m->where);
+ if ( s_stream )
+ get_msg_location (s_stream, &m->where);
+
if (!messages_disabled)
- msg_handler (m);
+ msg_handler (m);
free (m->text);
}
@@ -112,14 +112,14 @@ msg_emit (struct msg *m)
called an equal number of times before messages are actually
re-enabled. */
void
-msg_disable (void)
+msg_disable (void)
{
messages_disabled++;
}
/* Enables message output that was disabled by msg_disable. */
void
-msg_enable (void)
+msg_enable (void)
{
assert (messages_disabled > 0);
messages_disabled--;
@@ -130,7 +130,7 @@ msg_enable (void)
/* Sets COMMAND_NAME as the command name included in some kinds
of error messages. */
void
-msg_set_command_name (const char *command_name_)
+msg_set_command_name (const char *command_name_)
{
free (command_name);
command_name = command_name_ ? xstrdup (command_name_) : NULL;
@@ -138,12 +138,12 @@ msg_set_command_name (const char *command_name_)
/* Returns the current command name, or NULL if none. */
const char *
-msg_get_command_name (void)
+msg_get_command_name (void)
{
return command_name;
}
-void
+void
request_bug_report_and_abort (const char *msg)
{
fprintf (stderr, "******************************************************\n");
@@ -166,7 +166,7 @@ request_bug_report_and_abort (const char *msg)
#else
"Unknown"
#endif
- );
+ );
fprintf (stderr, "******************************************************\n");
_exit (EXIT_FAILURE);