X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Frepeat.c;h=c0510c5d5e26fc94df4dca0514660c369e8efe4d;hb=db5df54124af56dc1dfce71f839d78da2b49e346;hp=a5d2dfb8424d28b381d557755688713d34981b60;hpb=6eea9310493902d3b06b25c612c7ba89d467b6fa;p=pspp diff --git a/src/repeat.c b/src/repeat.c index a5d2dfb842..c0510c5d5e 100644 --- a/src/repeat.c +++ b/src/repeat.c @@ -355,8 +355,8 @@ parse_ids (struct repeat_entry * e) if (!parse_mixed_vars (&names, &nnames, PV_NONE)) return 0; - e->replacement = xrealloc (e->replacement, - (nnames + n) * sizeof *e->replacement); + e->replacement = xnrealloc (e->replacement, + nnames + n, sizeof *e->replacement); 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; - e->replacement = array = xrealloc (array, - m * sizeof *e->replacement); + e->replacement = array = xnrealloc (array, + m, sizeof *e->replacement); } if (a == b) @@ -470,8 +470,8 @@ parse_strings (struct repeat_entry * e) if (n + 1 > m) { m += 16; - e->replacement = string = xrealloc (string, - m * sizeof *e->replacement); + e->replacement = string = xnrealloc (string, + m, sizeof *e->replacement); } string[n++] = lex_token_representation (); lex_get (); @@ -479,7 +479,7 @@ parse_strings (struct repeat_entry * e) lex_match (','); } while (token != '/' && token != '.'); - e->replacement = xrealloc (string, n * sizeof *e->replacement); + e->replacement = xnrealloc (string, n, sizeof *e->replacement); return n; } @@ -579,7 +579,7 @@ perform_DO_REPEAT_substitutions (void) } } if (dot) - ds_putc (&output, get_endcmd() ); + ds_putc (&output, get_endcmd ()); ds_destroy (&getl_buf); getl_buf = output;