projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up file handle code in preparation to add temporary file
[pspp]
/
src
/
data-list.c
diff --git
a/src/data-list.c
b/src/data-list.c
index b615beea4b4925245e16f7b419667d2a7bd6e3c9..7ac36a1a5b77a1f76ea63dc247bac95ea7f195d4 100644
(file)
--- a/
src/data-list.c
+++ b/
src/data-list.c
@@
-798,7
+798,7
@@
dump_fixed_table (const struct dls_var_spec *specs,
if (fh != NULL)
tab_title (t, 1, ngettext ("Reading %d record from file %s.",
"Reading %d records from file %s.", rec_cnt),
if (fh != NULL)
tab_title (t, 1, ngettext ("Reading %d record from file %s.",
"Reading %d records from file %s.", rec_cnt),
- rec_cnt,
handle
_get_filename (fh));
+ rec_cnt,
fh
_get_filename (fh));
else
tab_title (t, 1, ngettext ("Reading %d record from the command file.",
"Reading %d records from the command file.",
else
tab_title (t, 1, ngettext ("Reading %d record from the command file.",
"Reading %d records from the command file.",
@@
-844,7
+844,7
@@
parse_free (struct dls_var_spec **first, struct dls_var_spec **last)
{
lex_match ('*');
input = make_input_format (FMT_F, 8, 0);
{
lex_match ('*');
input = make_input_format (FMT_F, 8, 0);
- output = get_format ();
+ output =
*
get_format ();
}
if (input.type == FMT_A || input.type == FMT_AHEX)
}
if (input.type == FMT_A || input.type == FMT_AHEX)
@@
-919,7
+919,7
@@
dump_free_table (const struct data_list_pgm *dls,
if (fh != NULL)
tab_title (t, 1, _("Reading free-form data from file %s."),
if (fh != NULL)
tab_title (t, 1, _("Reading free-form data from file %s."),
-
handle
_get_filename (fh));
+
fh
_get_filename (fh));
else
tab_title (t, 1, _("Reading free-form data from the command file."));
else
tab_title (t, 1, _("Reading free-form data from the command file."));
@@
-1585,7
+1585,7
@@
cmd_repeating_data (void)
/* Calculate and check starts_end, cont_end if necessary. */
if (rpd->starts_end.num == 0 && rpd->starts_end.var == NULL)
{
/* Calculate and check starts_end, cont_end if necessary. */
if (rpd->starts_end.num == 0 && rpd->starts_end.var == NULL)
{
- rpd->starts_end.num = fh != NULL ?
handle
_get_record_width (fh) : 80;
+ rpd->starts_end.num = fh != NULL ?
fh
_get_record_width (fh) : 80;
if (rpd->starts_beg.num != 0
&& rpd->starts_beg.num > rpd->starts_end.num)
{
if (rpd->starts_beg.num != 0
&& rpd->starts_beg.num > rpd->starts_end.num)
{
@@
-1598,7
+1598,7
@@
cmd_repeating_data (void)
}
if (rpd->cont_end.num == 0 && rpd->cont_end.var == NULL)
{
}
if (rpd->cont_end.num == 0 && rpd->cont_end.var == NULL)
{
- rpd->cont_end.num = fh != NULL ?
handle
_get_record_width (fh) : 80;
+ rpd->cont_end.num = fh != NULL ?
fh
_get_record_width (fh) : 80;
if (rpd->cont_beg.num != 0
&& rpd->cont_beg.num > rpd->cont_end.num)
{
if (rpd->cont_beg.num != 0
&& rpd->cont_beg.num > rpd->cont_end.num)
{