/[pspp]/pspp/src/repeat.c
ViewVC logotype

Diff of /pspp/src/repeat.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.19 by blp, Tue Oct 25 04:28:17 2005 UTC revision 1.20 by blp, Wed Oct 26 05:06:14 2005 UTC
# Line 355  parse_ids (struct repeat_entry * e) Line 355  parse_ids (struct repeat_entry * e)
355        if (!parse_mixed_vars (&names, &nnames, PV_NONE))        if (!parse_mixed_vars (&names, &nnames, PV_NONE))
356          return 0;          return 0;
357    
358        e->replacement = xrealloc (e->replacement,        e->replacement = xnrealloc (e->replacement,
359                                   (nnames + n) * sizeof *e->replacement);                                    nnames + n, sizeof *e->replacement);
360        for (i = 0; i < nnames; i++)        for (i = 0; i < nnames; i++)
361          {          {
362            e->replacement[n + i] = xstrdup (names[i]);            e->replacement[n + i] = xstrdup (names[i]);
# Line 418  parse_numbers (struct repeat_entry *e) Line 418  parse_numbers (struct repeat_entry *e)
418        if (n + (abs (b - a) + 1) > m)        if (n + (abs (b - a) + 1) > m)
419          {          {
420            m = n + (abs (b - a) + 1) + 16;            m = n + (abs (b - a) + 1) + 16;
421            e->replacement = array = xrealloc (array,            e->replacement = array = xnrealloc (array,
422                                               m * sizeof *e->replacement);                                                m, sizeof *e->replacement);
423          }          }
424    
425        if (a == b)        if (a == b)
# Line 470  parse_strings (struct repeat_entry * e) Line 470  parse_strings (struct repeat_entry * e)
470        if (n + 1 > m)        if (n + 1 > m)
471          {          {
472            m += 16;            m += 16;
473            e->replacement = string = xrealloc (string,            e->replacement = string = xnrealloc (string,
474                                                m * sizeof *e->replacement);                                                 m, sizeof *e->replacement);
475          }          }
476        string[n++] = lex_token_representation ();        string[n++] = lex_token_representation ();
477        lex_get ();        lex_get ();
# Line 479  parse_strings (struct repeat_entry * e) Line 479  parse_strings (struct repeat_entry * e)
479        lex_match (',');        lex_match (',');
480      }      }
481    while (token != '/' && token != '.');    while (token != '/' && token != '.');
482    e->replacement = xrealloc (string, n * sizeof *e->replacement);    e->replacement = xnrealloc (string, n, sizeof *e->replacement);
483    
484    return n;    return n;
485  }  }

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26