projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix description of "count" in Auxiliary Variable Parameter Record.
[pspp]
/
src
/
repeat.c
diff --git
a/src/repeat.c
b/src/repeat.c
index 0f5bb42f4dbc4aec79b75417b040f4c779314a57..c0510c5d5e26fc94df4dca0514660c369e8efe4d 100644
(file)
--- a/
src/repeat.c
+++ b/
src/repeat.c
@@
-341,8
+341,8
@@
internal_cmd_do_repeat (void)
static int
parse_ids (struct repeat_entry * e)
{
static int
parse_ids (struct repeat_entry * e)
{
-
in
t i;
-
in
t n = 0;
+
size_
t i;
+
size_
t n = 0;
e->type = 1;
e->replacement = NULL;
e->type = 1;
e->replacement = NULL;
@@
-350,13
+350,13
@@
parse_ids (struct repeat_entry * e)
do
{
char **names;
do
{
char **names;
-
in
t nnames;
+
size_
t nnames;
if (!parse_mixed_vars (&names, &nnames, PV_NONE))
return 0;
if (!parse_mixed_vars (&names, &nnames, PV_NONE))
return 0;
- e->replacement = xrealloc (e->replacement,
-
(nnames + n) *
sizeof *e->replacement);
+ e->replacement = x
n
realloc (e->replacement,
+
nnames + n,
sizeof *e->replacement);
for (i = 0; i < nnames; i++)
{
e->replacement[n + i] = xstrdup (names[i]);
for (i = 0; i < nnames; i++)
{
e->replacement[n + i] = xstrdup (names[i]);
@@
-418,8
+418,8
@@
parse_numbers (struct repeat_entry *e)
if (n + (abs (b - a) + 1) > m)
{
m = n + (abs (b - a) + 1) + 16;
if (n + (abs (b - a) + 1) > m)
{
m = n + (abs (b - a) + 1) + 16;
- e->replacement = array = xrealloc (array,
-
m *
sizeof *e->replacement);
+ e->replacement = array = x
n
realloc (array,
+
m,
sizeof *e->replacement);
}
if (a == b)
}
if (a == b)
@@
-470,8
+470,8
@@
parse_strings (struct repeat_entry * e)
if (n + 1 > m)
{
m += 16;
if (n + 1 > m)
{
m += 16;
- e->replacement = string = xrealloc (string,
-
m *
sizeof *e->replacement);
+ e->replacement = string = x
n
realloc (string,
+
m,
sizeof *e->replacement);
}
string[n++] = lex_token_representation ();
lex_get ();
}
string[n++] = lex_token_representation ();
lex_get ();
@@
-479,7
+479,7
@@
parse_strings (struct repeat_entry * e)
lex_match (',');
}
while (token != '/' && token != '.');
lex_match (',');
}
while (token != '/' && token != '.');
- e->replacement = x
realloc (string, n *
sizeof *e->replacement);
+ e->replacement = x
nrealloc (string, n,
sizeof *e->replacement);
return n;
}
return n;
}
@@
-579,7
+579,7
@@
perform_DO_REPEAT_substitutions (void)
}
}
if (dot)
}
}
if (dot)
- ds_putc (&output, get_endcmd
()
);
+ ds_putc (&output, get_endcmd
()
);
ds_destroy (&getl_buf);
getl_buf = output;
ds_destroy (&getl_buf);
getl_buf = output;