projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the msg function to report errors wherever possible.
[pspp]
/
src
/
output
/
journal.c
diff --git
a/src/output/journal.c
b/src/output/journal.c
index 2b5835052029dbfda9ecf19fb27702be354d9be8..5c84a5f84ee5b1fffa5e37d67a8667d6199076f5 100644
(file)
--- a/
src/output/journal.c
+++ b/
src/output/journal.c
@@
-24,12
+24,12
@@
#include "data/file-name.h"
#include "libpspp/cast.h"
#include "data/file-name.h"
#include "libpspp/cast.h"
+#include "libpspp/message.h"
#include "libpspp/str.h"
#include "output/driver-provider.h"
#include "output/message-item.h"
#include "output/text-item.h"
#include "libpspp/str.h"
#include "output/driver-provider.h"
#include "output/message-item.h"
#include "output/text-item.h"
-#include "gl/error.h"
#include "gl/fwriteerror.h"
#include "gl/xalloc.h"
#include "gl/fwriteerror.h"
#include "gl/xalloc.h"
@@
-64,7
+64,7
@@
journal_close (void)
if (journal != NULL && journal->file != NULL)
{
if (fwriteerror (journal->file))
if (journal != NULL && journal->file != NULL)
{
if (fwriteerror (journal->file))
-
error (0,
errno, _("error writing output file `%s'"),
+
msg_error (
errno, _("error writing output file `%s'"),
journal_file_name);
journal->file = NULL;
}
journal_file_name);
journal->file = NULL;
}
@@
-90,7
+90,7
@@
journal_output (struct journal_driver *j, const char *s)
j->file = fopen (journal_get_file_name (), "a");
if (j->file == NULL)
{
j->file = fopen (journal_get_file_name (), "a");
if (j->file == NULL)
{
-
error (0,
errno, _("error opening output file `%s'"),
+
msg_error (
errno, _("error opening output file `%s'"),
journal_get_file_name ());
output_driver_destroy (&j->driver);
return;
journal_get_file_name ());
output_driver_destroy (&j->driver);
return;