projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed visibility from those toolbar buttons whose actions are
[pspp]
/
src
/
libpspp
/
message.c
diff --git
a/src/libpspp/message.c
b/src/libpspp/message.c
index 24bb8e874ba10d77dd29cf76e168af795cfaee8a..3431f67fa95c62d250159a25c42385f9e5d3150c 100644
(file)
--- a/
src/libpspp/message.c
+++ b/
src/libpspp/message.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-63,20
+62,23
@@
msg (enum msg_class class, const char *format, ...)
msg_emit (&m);
}
msg_emit (&m);
}
+static struct source_stream *s_stream;
+
void
void
-msg_init ( void (*handler) (const struct msg *) )
+msg_init (
struct source_stream *ss,
void (*handler) (const struct msg *) )
{
{
+ s_stream = ss;
msg_handler = handler;
}
void
msg_handler = handler;
}
void
-msg_done (void)
+msg_done (void)
{
}
/* Duplicate a message */
{
}
/* Duplicate a message */
-struct msg *
+struct msg *
msg_dup(const struct msg *m)
{
struct msg *new_msg = xmalloc (sizeof *m);
msg_dup(const struct msg *m)
{
struct msg *new_msg = xmalloc (sizeof *m);
@@
-97,9
+99,9
@@
msg_destroy(struct msg *m)
/* Emits M as an error message.
Frees allocated data in M. */
void
/* 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 (&m->where);
+ get_msg_location (
s_stream,
&m->where);
if (!messages_disabled)
msg_handler (m);
free (m->text);
if (!messages_disabled)
msg_handler (m);
free (m->text);
@@
-110,14
+112,14
@@
msg_emit (struct msg *m)
called an equal number of times before messages are actually
re-enabled. */
void
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
{
messages_disabled++;
}
/* Enables message output that was disabled by msg_disable. */
void
-msg_enable (void)
+msg_enable (void)
{
assert (messages_disabled > 0);
messages_disabled--;
{
assert (messages_disabled > 0);
messages_disabled--;
@@
-128,7
+130,7
@@
msg_enable (void)
/* Sets COMMAND_NAME as the command name included in some kinds
of error messages. */
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;
{
free (command_name);
command_name = command_name_ ? xstrdup (command_name_) : NULL;
@@
-136,12
+138,12
@@
msg_set_command_name (const char *command_name_)
/* Returns the current command name, or NULL if none. */
const char *
/* Returns the current command name, or NULL if none. */
const char *
-msg_get_command_name (void)
+msg_get_command_name (void)
{
return command_name;
}
{
return command_name;
}
-void
+void
request_bug_report_and_abort (const char *msg)
{
fprintf (stderr, "******************************************************\n");
request_bug_report_and_abort (const char *msg)
{
fprintf (stderr, "******************************************************\n");
@@
-164,7
+166,7
@@
request_bug_report_and_abort (const char *msg)
#else
"Unknown"
#endif
#else
"Unknown"
#endif
- );
+ );
fprintf (stderr, "******************************************************\n");
_exit (EXIT_FAILURE);
fprintf (stderr, "******************************************************\n");
_exit (EXIT_FAILURE);