projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MEANS: remove arguments to callbacks which were always unused
[pspp]
/
src
/
language
/
data-io
/
file-handle.q
diff --git
a/src/language/data-io/file-handle.q
b/src/language/data-io/file-handle.q
index 9bf6a6bf52ffaa664aaea7db9717fcefbc23aee9..0519803e7fc08080217ae4593382a4d045813780 100644
(file)
--- a/
src/language/data-io/file-handle.q
+++ b/
src/language/data-io/file-handle.q
@@
-43,7
+43,7
@@
"FILE HANDLE" (fh_):
name=string;
lrecl=integer;
"FILE HANDLE" (fh_):
name=string;
lrecl=integer;
- tabwidth=integer
"x>=0" "%s must be nonnegative"
;
+ tabwidth=integer;
mode=mode:!character/binary/image/360;
recform=recform:fixed/f/variable/v/spanned/vs.
*/
mode=mode:!character/binary/image/360;
recform=recform:fixed/f/variable/v/spanned/vs.
*/
@@
-86,7
+86,7
@@
cmd_file_handle (struct lexer *lexer, struct dataset *ds)
properties = *fh_default_properties ();
if (cmd.s_name == NULL)
{
properties = *fh_default_properties ();
if (cmd.s_name == NULL)
{
- lex_sbc_missing (
lexer,
"NAME");
+ lex_sbc_missing ("NAME");
goto exit_free_cmd;
}
goto exit_free_cmd;
}
@@
-95,7
+95,12
@@
cmd_file_handle (struct lexer *lexer, struct dataset *ds)
case FH_CHARACTER:
properties.mode = FH_MODE_TEXT;
if (cmd.sbc_tabwidth)
case FH_CHARACTER:
properties.mode = FH_MODE_TEXT;
if (cmd.sbc_tabwidth)
- properties.tab_width = cmd.n_tabwidth[0];
+ {
+ if (cmd.n_tabwidth[0] >= 0)
+ properties.tab_width = cmd.n_tabwidth[0];
+ else
+ msg (SE, _("%s must not be negative."), "TABWIDTH");
+ }
break;
case FH_IMAGE:
properties.mode = FH_MODE_FIXED;
break;
case FH_IMAGE:
properties.mode = FH_MODE_FIXED;