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]) |
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++) |
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 |
} |
} |
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); |