X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fdata-writer.c;h=bf9505e7dd82878270a59ab13372c2a0137720c4;hb=50c7b5b389eb39accf65c8716f6a3f73b5b30aa6;hp=8ae72513391bd8949a52e3180e89cf7c63467f62;hpb=40214686362e348692b4b6bd05ed5522189525c0;p=pspp diff --git a/src/language/data-io/data-writer.c b/src/language/data-io/data-writer.c index 8ae7251339..bf9505e7dd 100644 --- a/src/language/data-io/data-writer.c +++ b/src/language/data-io/data-writer.c @@ -92,8 +92,7 @@ dfm_open_writer (struct file_handle *fh, const char *encoding) w = xmalloc (sizeof *w); w->fh = fh_ref (fh); w->lock = lock; - w->rf = replace_file_start (w->fh, "wb", 0666, - &w->file, NULL); + w->rf = replace_file_start (w->fh, "wb", 0666, &w->file); w->encoding = xstrdup (encoding); w->line_ends = fh_get_line_ends (fh); w->unit = ei.unit; @@ -115,7 +114,7 @@ dfm_open_writer (struct file_handle *fh, const char *encoding) return w; } -/* Returns false if an I/O error occurred on WRITER, true otherwise. */ +/* Returns true if an I/O error occurred on WRITER, false otherwise. */ bool dfm_write_error (const struct dfm_writer *writer) { @@ -219,7 +218,7 @@ dfm_close_writer (struct dfm_writer *w) if (w->file != NULL) { const char *file_name = fh_get_file_name (w->fh); - ok = !dfm_write_error (w) && !fn_close (file_name, w->file); + ok = !dfm_write_error (w) && !fn_close (w->fh, w->file); if (!ok) msg (ME, _("I/O error occurred writing data file `%s'."), file_name);