/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-2000, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 1997-2000, 2006-2007, 2009-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
/* Fetch file size. */
if (fstat (fileno (r->file), &s))
{
- pcp_error (ME, 0, _("%s: stat failed (%s)."),
+ pcp_error (r, 0, _("%s: stat failed (%s)."),
fh_get_file_name (r->fh), strerror (errno));
goto error;
}
if (s.st_size > UINT_MAX)
{
- pcp_error (ME, 0, _("%s: file too large."), fh_get_file_name (r->fh));
+ pcp_error (r, 0, _("%s: file too large."), fh_get_file_name (r->fh));
goto error;
}
r->file_size = s.st_size;
error:
pcp_close (&r->any_reader);
- dict_destroy (dict);
+ dict_unref (dict);
*dictp = NULL;
return NULL;
}
uint8_t len;
if (var->n_val_labs >= allocated_val_labs)
- var->val_labs = x2nrealloc (var->val_labs, &allocated_val_labs,
- sizeof *var->val_labs);
+ var->val_labs = pool_2nrealloc (r->pool, var->val_labs,
+ &allocated_val_labs,
+ sizeof *var->val_labs);
vl = &var->val_labs[var->n_val_labs];
if (!read_bytes (r, vl->value, sizeof vl->value)