projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GNU standards require "file name" instead of "filename" in
[pspp-builds.git]
/
src
/
data
/
por-file-reader.c
diff --git
a/src/data/por-file-reader.c
b/src/data/por-file-reader.c
index 3f385223e5afe74f277b6bb4e105a659902a4aec..0824bb311147993a0ad6795abfd654bea54f2ee9 100644
(file)
--- a/
src/data/por-file-reader.c
+++ b/
src/data/por-file-reader.c
@@
-86,17
+86,17
@@
static void
error (struct pfm_reader *r, const char *msg, ...)
{
struct error e;
error (struct pfm_reader *r, const char *msg, ...)
{
struct error e;
- const char *filename;
+ const char *file
_
name;
char *title;
va_list args;
e.class = ME;
char *title;
va_list args;
e.class = ME;
- e.where.filename = NULL;
+ e.where.file
_
name = NULL;
e.where.line_number = 0;
e.where.line_number = 0;
- file
name = fh_get_file
name (r->fh);
- e.title = title = pool_alloc (r->pool, strlen (filename) + 80);
+ file
_name = fh_get_file_
name (r->fh);
+ e.title = title = pool_alloc (r->pool, strlen (file
_
name) + 80);
sprintf (title, _("portable file %s corrupt at offset %ld: "),
sprintf (title, _("portable file %s corrupt at offset %ld: "),
- filename, ftell (r->file));
+ file
_
name, ftell (r->file));
va_start (args, msg);
err_vmsg (&e, msg, args);
va_start (args, msg);
err_vmsg (&e, msg, args);
@@
-172,7
+172,7
@@
pfm_open_reader (struct file_handle *fh, struct dictionary **dict,
if (setjmp (r->bail_out))
goto error;
r->fh = fh;
if (setjmp (r->bail_out))
goto error;
r->fh = fh;
- r->file = pool_fopen (r->pool, fh_get_filename (r->fh), "rb");
+ r->file = pool_fopen (r->pool, fh_get_file
_
name (r->fh), "rb");
r->weight_index = -1;
r->trans = NULL;
r->var_cnt = 0;
r->weight_index = -1;
r->trans = NULL;
r->var_cnt = 0;
@@
-185,7
+185,7
@@
pfm_open_reader (struct file_handle *fh, struct dictionary **dict,
{
msg (ME, _("An error occurred while opening \"%s\" for reading "
"as a portable file: %s."),
{
msg (ME, _("An error occurred while opening \"%s\" for reading "
"as a portable file: %s."),
- fh_get_filename (r->fh), strerror (errno));
+ fh_get_file
_
name (r->fh), strerror (errno));
goto error;
}
goto error;
}
@@
-403,7
+403,7
@@
read_header (struct pfm_reader *r)
for (i = 0; i < 8; i++)
if (!match (r, "SPSSPORT"[i]))
{
for (i = 0; i < 8; i++)
if (!match (r, "SPSSPORT"[i]))
{
- msg (SE, _("%s: Not a portable file."), fh_get_filename (r->fh));
+ msg (SE, _("%s: Not a portable file."), fh_get_file
_
name (r->fh));
longjmp (r->bail_out, 1);
}
}
longjmp (r->bail_out, 1);
}
}