projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a couple of bugs reported by Ben Kujala
[pspp-builds.git]
/
src
/
matrix-data.c
diff --git
a/src/matrix-data.c
b/src/matrix-data.c
index a699738ddb04ce8ddbc38d847e371f60fed306bd..e7747a89324fc8f8ab7f9f2bd854ac025471281d 100644
(file)
--- a/
src/matrix-data.c
+++ b/
src/matrix-data.c
@@
-394,7
+394,7
@@
cmd_matrix_data (void)
goto lossage;
}
goto lossage;
}
- if (!lex_i
nteger_p
() || lex_integer () < 1)
+ if (!lex_i
s_integer
() || lex_integer () < 1)
{
lex_error (_("expecting positive integer"));
goto lossage;
{
lex_error (_("expecting positive integer"));
goto lossage;
@@
-413,7
+413,7
@@
cmd_matrix_data (void)
goto lossage;
}
goto lossage;
}
- if (!lex_i
nteger_p
() || lex_integer () < 1)
+ if (!lex_i
s_integer
() || lex_integer () < 1)
{
lex_error (_("expecting positive integer"));
goto lossage;
{
lex_error (_("expecting positive integer"));
goto lossage;
@@
-767,7
+767,7
@@
context (struct dfm_reader *reader)
strcpy (buf, "at end of file");
else
{
strcpy (buf, "at end of file");
else
{
- struct
len
_string line;
+ struct
fixed
_string line;
const char *sp;
dfm_get_record (reader, &line);
const char *sp;
dfm_get_record (reader, &line);
@@
-801,7
+801,7
@@
another_token (struct dfm_reader *reader)
{
for (;;)
{
{
for (;;)
{
- struct
len
_string line;
+ struct
fixed
_string line;
const char *cp;
if (dfm_eof (reader))
const char *cp;
if (dfm_eof (reader))
@@
-826,7
+826,7
@@
another_token (struct dfm_reader *reader)
static int
(mget_token) (struct matrix_token *token, struct dfm_reader *reader)
{
static int
(mget_token) (struct matrix_token *token, struct dfm_reader *reader)
{
- struct
len
_string line;
+ struct
fixed
_string line;
int first_column;
char *cp;
int first_column;
char *cp;
@@
-904,7
+904,7
@@
static int
static int
force_eol (struct dfm_reader *reader, const char *content)
{
static int
force_eol (struct dfm_reader *reader, const char *content)
{
- struct
len
_string line;
+ struct
fixed
_string line;
const char *cp;
if (dfm_eof (reader))
const char *cp;
if (dfm_eof (reader))