/* Swap bytes *A and *B. */
static inline void
-bswap (unsigned char *a, unsigned char *b)
+bswap (char *a, char *b)
{
- unsigned char t = *a;
+ char t = *a;
*a = *b;
*b = t;
}
static inline void
bswap_int32 (int32 *x_)
{
- unsigned char *x = (unsigned char *) x_;
+ char *x = (char *) x_;
bswap (x + 0, x + 3);
bswap (x + 1, x + 2);
}
static inline void
bswap_flt64 (flt64 *x_)
{
- unsigned char *x = (unsigned char *) x_;
+ char *x = (char *) x_;
bswap (x + 0, x + 7);
bswap (x + 1, x + 6);
bswap (x + 2, x + 5);
*var_by_idx = 0;
/* Pre-allocate variables. */
- if ( r->value_cnt != -1 )
+ if (r->value_cnt != -1)
{
- *var_by_idx = xmalloc(r->value_cnt * sizeof (**var_by_idx));
- r->vars = xmalloc( r->value_cnt * sizeof (*r->vars) );
+ *var_by_idx = xnmalloc (r->value_cnt, sizeof **var_by_idx);
+ r->vars = xnmalloc (r->value_cnt, sizeof *r->vars);
}
if ( -1 == r->value_cnt )
{
- *var_by_idx = xrealloc (*var_by_idx, sizeof **var_by_idx * (i + 1));
- r->vars = xrealloc(r->vars, (i + 1) * sizeof (*r->vars) );
+ *var_by_idx = xnrealloc (*var_by_idx, i + 1, sizeof **var_by_idx);
+ r->vars = xnrealloc (r->vars, i + 1, sizeof *r->vars);
}
/* If there was a long string previously, make sure that the
if (vv->type == NUMERIC)
mv_add_num (&vv->miss, mv[j]);
else
- mv_add_str (&vv->miss, (unsigned char *) &mv[j]);
+ mv_add_str (&vv->miss, (char *) &mv[j]);
}
else
{
{
struct label
{
- unsigned char raw_value[8]; /* Value as uninterpreted bytes. */
+ char raw_value[8]; /* Value as uninterpreted bytes. */
union value value; /* Value. */
char *label; /* Null-terminated label string. */
};
}
/* Allocate memory. */
- labels = xcalloc (n_labels , sizeof *labels);
+ labels = xcalloc (n_labels, sizeof *labels);
for (i = 0; i < n_labels; i++)
labels[i].label = NULL;
handle_get_filename (r->fh), n_vars, dict_get_var_cnt (dict)));
/* Read the list of variables. */
- var = xmalloc (n_vars * sizeof *var);
+ var = xnmalloc (n_vars, sizeof *var);
for (i = 0; i < n_vars; i++)
{
int32 var_idx;
if (var[0]->type == ALPHA)
{
- const int copy_len = min (sizeof (label->raw_value),
- sizeof (label->label));
+ const int copy_len = min (sizeof label->raw_value,
+ sizeof label->label);
memcpy (label->value.s, label->raw_value, copy_len);
} else {
flt64 f;
size_t amt;
if (r->buf == NULL)
- r->buf = xmalloc (sizeof *r->buf * 128);
+ r->buf = xnmalloc (128, sizeof *r->buf);
amt = fread (r->buf, sizeof *r->buf, 128, r->file);
if (ferror (r->file))
{