projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update all #include directives to the currently preferred style.
[pspp-builds.git]
/
src
/
libpspp
/
message.c
diff --git
a/src/libpspp/message.c
b/src/libpspp/message.c
index 8bd6af956ddf55153df8cbbf11c4220f24a0c450..c7b56e0a8d3a1b680571244a835b680355eace7f 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, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010
, 2011
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
@@
-16,8
+16,8
@@
#include <config.h>
#include <config.h>
-#include "message.h"
-#include "msg-locator.h"
+#include "
libpspp/
message.h"
+#include "
libpspp/
msg-locator.h"
#include <assert.h>
#include <stdarg.h>
#include <assert.h>
#include <stdarg.h>
@@
-26,9
+26,9
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include
<libpspp/str.h>
-#include
<libpspp/version.h>
-#include
<data/settings.h>
+#include
"data/settings.h"
+#include
"libpspp/str.h"
+#include
"libpspp/version.h"
#include "gl/progname.h"
#include "gl/xalloc.h"
#include "gl/progname.h"
#include "gl/xalloc.h"
@@
-127,7
+127,7
@@
msg_to_string (const struct msg *m, const char *command_name)
if (m->where.line_number > 0)
{
if (!ds_is_empty (&s))
if (m->where.line_number > 0)
{
if (!ds_is_empty (&s))
- ds_put_
char
(&s, ':');
+ ds_put_
byte
(&s, ':');
ds_put_format (&s, "%d", m->where.line_number);
}
if (m->where.first_column > 0)
ds_put_format (&s, "%d", m->where.line_number);
}
if (m->where.first_column > 0)
@@
-271,7
+271,7
@@
process_msg (const struct msg *m)
void
msg_emit (struct msg *m)
{
void
msg_emit (struct msg *m)
{
- if ( s_stream )
+ if ( s_stream
&& m->where.file_name == NULL
)
{
struct msg_locator loc;
{
struct msg_locator loc;
@@
-312,7
+312,7
@@
msg_enable (void)
/* Private functions. */
void
/* Private functions. */
void
-request_bug_report
_and_abort
(const char *msg)
+request_bug_report (const char *msg)
{
fprintf (stderr, "******************************************************\n");
fprintf (stderr, "You have discovered a bug in PSPP. Please report this\n");
{
fprintf (stderr, "******************************************************\n");
fprintf (stderr, "You have discovered a bug in PSPP. Please report this\n");
@@
-334,7
+334,5
@@
request_bug_report_and_abort (const char *msg)
#endif
);
fprintf (stderr, "******************************************************\n");
#endif
);
fprintf (stderr, "******************************************************\n");
-
- _exit (EXIT_FAILURE);
}
}