projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
libpspp
/
message.c
diff --git
a/src/libpspp/message.c
b/src/libpspp/message.c
index 622388a1169d9433a367984205dbeafe3574670b..5faee1f1d6c8dc33279e36acc9b3188b56b1f218 100644
(file)
--- a/
src/libpspp/message.c
+++ b/
src/libpspp/message.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006
, 2009
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
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
@@
-26,10
+26,10
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include <libpspp/alloc.h>
#include <libpspp/version.h>
#include "progname.h"
#include <libpspp/version.h>
#include "progname.h"
+#include "xalloc.h"
#include "xvasprintf.h"
/* Current command name as set by msg_set_command_name(). */
#include "xvasprintf.h"
/* Current command name as set by msg_set_command_name(). */
@@
-82,7
+82,7
@@
msg_dup(const struct msg *m)
struct msg *new_msg = xmalloc (sizeof *m);
*new_msg = *m;
struct msg *new_msg = xmalloc (sizeof *m);
*new_msg = *m;
- new_msg->text = strdup(m->text);
+ new_msg->text =
x
strdup(m->text);
return new_msg;
}
return new_msg;
}
@@
-99,9
+99,11
@@
msg_destroy(struct msg *m)
void
msg_emit (struct msg *m)
{
void
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)
if (!messages_disabled)
- msg_handler (m);
+
msg_handler (m);
free (m->text);
}
free (m->text);
}