projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eliminated global variable getl_buf
[pspp-builds.git]
/
src
/
language
/
data-io
/
data-reader.c
diff --git
a/src/language/data-io/data-reader.c
b/src/language/data-io/data-reader.c
index 6cd92882eb6c854faab2de03c332b49a767fa7b0..6458a82172b5b14c26958589a0c7671208e21a77 100644
(file)
--- a/
src/language/data-io/data-reader.c
+++ b/
src/language/data-io/data-reader.c
@@
-170,7
+170,7
@@
read_inline_record (struct dfm_reader *r)
getl_set_prompt_style (GETL_PROMPT_DATA);
}
getl_set_prompt_style (GETL_PROMPT_DATA);
}
- if (!
getl_read_line (NULL
))
+ if (!
lex_get_line_raw (
))
{
msg (SE, _("Unexpected end-of-file while reading data in BEGIN "
"DATA. This probably indicates "
{
msg (SE, _("Unexpected end-of-file while reading data in BEGIN "
"DATA. This probably indicates "
@@
-180,14
+180,15
@@
read_inline_record (struct dfm_reader *r)
return false;
}
return false;
}
- if (ds_length (
&getl_buf
) >= 8
- && !strncasecmp (
ds_cstr (&getl_buf
), "end data", 8))
+ if (ds_length (
lex_entire_line_ds()
) >= 8
+ && !strncasecmp (
lex_entire_line (
), "end data", 8))
{
{
- lex_
set_prog (ds_end (&getl_buf)
);
+ lex_
discard_line (
);
return false;
}
return false;
}
- ds_assign_string (&r->line, &getl_buf);
+ ds_assign_string (&r->line, lex_entire_line_ds () );
+
return true;
}
return true;
}