projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applying patch #5562
[pspp-builds.git]
/
src
/
libpspp
/
message.c
diff --git
a/src/libpspp/message.c
b/src/libpspp/message.c
index 1a4601fc18981b55bf3ed9f1422b1478d872e8ac..24bb8e874ba10d77dd29cf76e168af795cfaee8a 100644
(file)
--- a/
src/libpspp/message.c
+++ b/
src/libpspp/message.c
@@
-19,7
+19,8
@@
#include <config.h>
#include <config.h>
-#include <libpspp/message.h>
+#include "message.h"
+#include "msg-locator.h"
#include <assert.h>
#include <stdarg.h>
#include <assert.h>
#include <stdarg.h>
@@
-39,8
+40,6
@@
static char *command_name;
/* Message handler as set by msg_init(). */
static void (*msg_handler) (const struct msg *);
/* Message handler as set by msg_init(). */
static void (*msg_handler) (const struct msg *);
-static void (*msg_location) (struct msg_locator *);
-
/* Disables emitting messages if positive. */
static int messages_disabled;
/* Disables emitting messages if positive. */
static int messages_disabled;
@@
-65,11
+64,9
@@
msg (enum msg_class class, const char *format, ...)
}
void
}
void
-msg_init ( void (*handler) (const struct msg *),
- void (*location) (struct msg_locator *) )
+msg_init ( void (*handler) (const struct msg *) )
{
msg_handler = handler;
{
msg_handler = handler;
- msg_location = location;
}
void
}
void
@@
-102,7
+99,7
@@
msg_destroy(struct msg *m)
void
msg_emit (struct msg *m)
{
void
msg_emit (struct msg *m)
{
- msg_location (&m->where);
+
get_
msg_location (&m->where);
if (!messages_disabled)
msg_handler (m);
free (m->text);
if (!messages_disabled)
msg_handler (m);
free (m->text);