projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops: fix ChangeLogs.
[pspp]
/
src
/
data
/
por-file-writer.c
diff --git
a/src/data/por-file-writer.c
b/src/data/por-file-writer.c
index 5d6d1efabd9cf6f75effac30b79780d3e3f426dc..202d4c28ab9499a57adcabbdbcd59de889fca847 100644
(file)
--- a/
src/data/por-file-writer.c
+++ b/
src/data/por-file-writer.c
@@
-19,7
+19,7
@@
#include <config.h>
#include "por-file-writer.h"
#include <config.h>
#include "por-file-writer.h"
-#include
"message.h"
+#include
<libpspp/message.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@
-30,25
+30,23
@@
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
-#include
"alloc.h"
+#include
<libpspp/alloc.h>
#include "case.h"
#include "dictionary.h"
#include "case.h"
#include "dictionary.h"
-#include
"message.h"
+#include
<libpspp/message.h>
#include "file-handle-def.h"
#include "file-handle-def.h"
-#include
"hash.h"
-#include
"magic.h"
-#include
"misc.h"
+#include
<libpspp/hash.h>
+#include
<libpspp/magic.h>
+#include
<libpspp/misc.h>
#include "stat-macros.h"
#include "stat-macros.h"
-#include
"str.h"
+#include
<libpspp/str.h>
#include "value-labels.h"
#include "variable.h"
#include "value-labels.h"
#include "variable.h"
-#include
"version.h"
+#include
<libpspp/version.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include "debug-print.h"
-
/* Portable file writer. */
struct pfm_writer
{
/* Portable file writer. */
struct pfm_writer
{
@@
-107,7
+105,7
@@
pfm_open_writer (struct file_handle *fh, struct dictionary *dict,
mode = S_IRUSR | S_IRGRP | S_IROTH;
if (opts.create_writeable)
mode |= S_IWUSR | S_IWGRP | S_IWOTH;
mode = S_IRUSR | S_IRGRP | S_IROTH;
if (opts.create_writeable)
mode |= S_IWUSR | S_IWGRP | S_IWOTH;
- fd = open (fh_get_filename (fh), O_WRONLY | O_CREAT | O_TRUNC, mode);
+ fd = open (fh_get_file
_
name (fh), O_WRONLY | O_CREAT | O_TRUNC, mode);
if (fd < 0)
goto open_error;
if (fd < 0)
goto open_error;
@@
-164,7
+162,7
@@
pfm_open_writer (struct file_handle *fh, struct dictionary *dict,
open_error:
msg (ME, _("An error occurred while opening \"%s\" for writing "
"as a portable file: %s."),
open_error:
msg (ME, _("An error occurred while opening \"%s\" for writing "
"as a portable file: %s."),
- fh_get_filename (fh), strerror (errno));
+ fh_get_file
_
name (fh), strerror (errno));
goto error;
}
\f
goto error;
}
\f
@@
-447,7
+445,7
@@
pfm_close_writer (struct pfm_writer *w)
if (!ok)
msg (ME, _("An I/O error occurred writing portable file \"%s\"."),
if (!ok)
msg (ME, _("An I/O error occurred writing portable file \"%s\"."),
- fh_get_filename (w->fh));
+ fh_get_file
_
name (w->fh));
}
fh_close (w->fh, "portable file", "we");
}
fh_close (w->fh, "portable file", "we");