/[pspp]/pspp/src/vars-prs.c
ViewVC logotype

Diff of /pspp/src/vars-prs.c

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

revision 1.21 by jmd, Mon Oct 24 05:41:45 2005 UTC revision 1.22 by blp, Wed Oct 26 05:06:14 2005 UTC
# Line 164  add_variable (struct variable ***v, size Line 164  add_variable (struct variable ***v, size
164        if (*nv >= *mv)        if (*nv >= *mv)
165          {          {
166            *mv = 2 * (*nv + 1);            *mv = 2 * (*nv + 1);
167            *v = xrealloc (*v, *mv * sizeof **v);            *v = xnrealloc (*v, *mv, sizeof **v);
168          }          }
169    
170        if ((pv_opts & PV_DUPLICATE) || !included[idx])        if ((pv_opts & PV_DUPLICATE) || !included[idx])
# Line 426  parse_DATA_LIST_vars (char ***names, siz Line 426  parse_DATA_LIST_vars (char ***names, siz
426            if (mvar < nvar + (n2 - n1 + 1))            if (mvar < nvar + (n2 - n1 + 1))
427              {              {
428                mvar += ROUND_UP (n2 - n1 + 1, 16);                mvar += ROUND_UP (n2 - n1 + 1, 16);
429                *names = xrealloc (*names, mvar * sizeof **names);                *names = xnrealloc (*names, mvar, sizeof **names);
430              }              }
431    
432            for (n = n1; n <= n2; n++)            for (n = n1; n <= n2; n++)
# Line 442  parse_DATA_LIST_vars (char ***names, siz Line 442  parse_DATA_LIST_vars (char ***names, siz
442            if (nvar >= mvar)            if (nvar >= mvar)
443              {              {
444                mvar += 16;                mvar += 16;
445                *names = xrealloc (*names, mvar * sizeof **names);                *names = xnrealloc (*names, mvar, sizeof **names);
446              }              }
447            (*names)[nvar++] = xstrdup (name1);            (*names)[nvar++] = xstrdup (name1);
448          }          }
# Line 495  parse_mixed_vars (char ***names, size_t Line 495  parse_mixed_vars (char ***names, size_t
495    
496            if (!parse_variables (default_dict, &v, &nv, PV_NONE))            if (!parse_variables (default_dict, &v, &nv, PV_NONE))
497              goto fail;              goto fail;
498            *names = xrealloc (*names, (*nnames + nv) * sizeof **names);            *names = xnrealloc (*names, *nnames + nv, sizeof **names);
499            for (i = 0; i < nv; i++)            for (i = 0; i < nv; i++)
500              (*names)[*nnames + i] = xstrdup (v[i]->name);              (*names)[*nnames + i] = xstrdup (v[i]->name);
501            free (v);            free (v);

Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22

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