X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fdfm-write.c;h=39aa7e387933b767bf4e13219e262f7ef0d0803b;hb=053e7ff6e0a45a25d5604b211e9c950fff50e75d;hp=2bf3f15674bfafd291aef0473a11d8af32681f2d;hpb=4de79b34b329d1da6cdeb145993d3efd911e2967;p=pspp diff --git a/src/dfm-write.c b/src/dfm-write.c index 2bf3f15674..39aa7e3879 100644 --- a/src/dfm-write.c +++ b/src/dfm-write.c @@ -46,7 +46,7 @@ dfm_open_writer (struct file_handle *fh) struct dfm_writer *w; void **aux; - aux = fh_open (fh, "data file", "ws"); + aux = fh_open (fh, FH_REF_FILE, "data file", "ws"); if (aux == NULL) return NULL; if (*aux != NULL) @@ -57,7 +57,7 @@ dfm_open_writer (struct file_handle *fh) w->file.file = NULL; w->bounce = NULL; - w->file.filename = xstrdup (handle_get_filename (w->fh)); + w->file.filename = xstrdup (fh_get_filename (w->fh)); w->file.mode = "wb"; w->file.file = NULL; w->file.sequence_no = NULL; @@ -69,7 +69,7 @@ dfm_open_writer (struct file_handle *fh) { msg (ME, _("An error occurred while opening \"%s\" for writing " "as a data file: %s."), - handle_get_filename (w->fh), strerror (errno)); + fh_get_filename (w->fh), strerror (errno)); goto error; } @@ -89,10 +89,10 @@ dfm_put_record (struct dfm_writer *w, const char *rec, size_t len) { assert (w != NULL); - if (handle_get_mode (w->fh) == MODE_BINARY - && len < handle_get_record_width (w->fh)) + if (fh_get_mode (w->fh) == FH_MODE_BINARY + && len < fh_get_record_width (w->fh)) { - size_t rec_width = handle_get_record_width (w->fh); + size_t rec_width = fh_get_record_width (w->fh); if (w->bounce == NULL) w->bounce = xmalloc (rec_width); memcpy (w->bounce, rec, len); @@ -104,7 +104,7 @@ dfm_put_record (struct dfm_writer *w, const char *rec, size_t len) if (fwrite (rec, len, 1, w->file.file) != 1) { msg (ME, _("Error writing file %s: %s."), - handle_get_name (w->fh), strerror (errno)); + fh_get_name (w->fh), strerror (errno)); err_cond_fail (); return 0; }