w->x = w->y = NULL;
w->var_cnt = dict_get_var_cnt (d);
- w->vars = xmalloc (sizeof *w->vars * w->var_cnt);
+ w->vars = xnmalloc (w->var_cnt, sizeof *w->vars);
for (i = 0; i < w->var_cnt; i++)
{
const struct variable *dv = dict_get_var (d, i);
if (w->compress)
{
- w->buf = xmalloc (sizeof *w->buf * 128);
+ w->buf = xnmalloc (128, sizeof *w->buf);
w->ptr = w->buf;
w->end = &w->buf[128];
w->x = (unsigned char *) w->ptr++;
*loc++ = vl->value.f;
*(unsigned char *) loc = len;
- memcpy (&((unsigned char *) loc)[1], vl->label, len);
- memset (&((unsigned char *) loc)[1 + len], ' ',
+ memcpy (&((char *) loc)[1], vl->label, len);
+ memset (&((char *) loc)[1 + len], ' ',
REM_RND_UP (len + 1, sizeof (flt64)));
loc += DIV_RND_UP (len + 1, sizeof (flt64));
}