const bool n_sample_test = (value_compare_3way (&nst->val2, &nst->val1,
var_get_width (nst->indep_var)) > 0);
- struct results *results = xcalloc (nst->n_vars, sizeof (*results));
+ struct results *results = XCALLOC (nst->n_vars, struct results);
int n_vals = 0;
for (v = 0; v < nst->n_vars; ++v)
{
if (n_sample_test == false)
{
- struct val_node *vn = xzalloc (sizeof *vn);
+ struct val_node *vn = XZALLOC (struct val_node);
value_clone (&vn->val, &nst->val1, var_get_width (nst->indep_var));
hmap_insert (&map, &vn->node, value_hash (&nst->val1,
var_get_width (nst->indep_var), 0));
var_get_width (nst->indep_var), 0));
}
- if ( median == SYSMIS)
+ if (median == SYSMIS)
{
struct percentile *ptl;
struct order_stats *os;
rr = casereader_clone (r);
writer = sort_create_writer (&sc, casereader_get_proto (rr));
- for (; (c = casereader_read (rr)) != NULL; )
+ for (; (c = casereader_read (rr)) != NULL;)
{
- if ( var_is_value_missing (var, case_data (c, var), exclude))
+ if (var_is_value_missing (var, case_data (c, var)) & exclude)
{
case_unref (c);
continue;
cc += dict_get_case_weight (dict, c, &warn);
casewriter_write (writer, c);
}
- subcase_destroy (&sc);
+ subcase_uninit (&sc);
casereader_destroy (rr);
rr = casewriter_make_reader (writer);
const union value *val = case_data (c, var);
const union value *indep_val = case_data (c, nst->indep_var);
- if ( var_is_value_missing (var, case_data (c, var), exclude))
+ if (var_is_value_missing (var, case_data (c, var)) & exclude)
{
continue;
}
value_compare_3way (indep_val, &nst->val1, width) < 0
||
value_compare_3way (indep_val, &nst->val2, width) > 0
- )
+ )
{
continue;
}
}
vn = find_value (&map, indep_val, nst->indep_var);
- if ( vn == NULL)
+ if (vn == NULL)
{
- if ( n_sample_test == true)
+ if (n_sample_test == true)
{
int width = var_get_width (nst->indep_var);
vn = xzalloc (sizeof *vn);
}
results[v].n = count;
- results[v].sorted_array = xcalloc (hmap_count (&map), sizeof (void*));
+ results[v].sorted_array = XCALLOC (hmap_count (&map), struct val_node *);
results[v].var = var;
HMAP_FOR_EACH (vn, struct val_node, node, &map)