projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subcase: Rename subcase_destroy() to subcase_uninit().
[pspp]
/
src
/
language
/
stats
/
rank.c
diff --git
a/src/language/stats/rank.c
b/src/language/stats/rank.c
index 7e76d68abac4d74b8b858b83254966976c9af550..af0eb215387160c5bf037f329a0f398203c33ae9 100644
(file)
--- a/
src/language/stats/rank.c
+++ b/
src/language/stats/rank.c
@@
-243,7
+243,7
@@
destroy_rank (struct rank *rank)
{
free (rank->vars);
free (rank->group_vars);
{
free (rank->vars);
free (rank->group_vars);
- subcase_
destroy
(&rank->sc);
+ subcase_
uninit
(&rank->sc);
pool_destroy (rank->pool);
}
pool_destroy (rank->pool);
}
@@
-555,7
+555,7
@@
rank_sorted_file (struct casereader *input,
/* Do ranking. */
subcase_init (&input_var, 0, 0, SC_ASCEND);
tie_grouper = casegrouper_create_subcase (input, &input_var);
/* Do ranking. */
subcase_init (&input_var, 0, 0, SC_ASCEND);
tie_grouper = casegrouper_create_subcase (input, &input_var);
- subcase_
destroy
(&input_var);
+ subcase_
uninit
(&input_var);
for (; casegrouper_get_next_group (tie_grouper, &tied_cases);
casereader_destroy (tied_cases))
{
for (; casegrouper_get_next_group (tie_grouper, &tied_cases);
casereader_destroy (tied_cases))
{
@@
-996,7
+996,7
@@
rank_cmd (struct dataset *ds, const struct rank *cmd)
for (i = 0; i < cmd->n_vars; i++)
outputs[i] = sort_create_writer (&by_order, output_proto);
for (i = 0; i < cmd->n_vars; i++)
outputs[i] = sort_create_writer (&by_order, output_proto);
- subcase_
destroy
(&by_order);
+ subcase_
uninit
(&by_order);
caseproto_unref (output_proto);
}
caseproto_unref (output_proto);
}
@@
-1047,7
+1047,7
@@
rank_cmd (struct dataset *ds, const struct rank *cmd)
else
weight_idx = -1;
input_pass = casereader_project (input_pass, &projection);
else
weight_idx = -1;
input_pass = casereader_project (input_pass, &projection);
- subcase_
destroy
(&projection);
+ subcase_
uninit
(&projection);
/* Prepare 'group_vars' as the set of grouping variables. */
subcase_init_empty (&group_vars);
/* Prepare 'group_vars' as the set of grouping variables. */
subcase_init_empty (&group_vars);
@@
-1068,7
+1068,7
@@
rank_cmd (struct dataset *ds, const struct rank *cmd)
var_get_width (dict_get_split_vars (d)[j]),
SC_ASCEND);
split_grouper = casegrouper_create_subcase (input_pass, &split_vars);
var_get_width (dict_get_split_vars (d)[j]),
SC_ASCEND);
split_grouper = casegrouper_create_subcase (input_pass, &split_vars);
- subcase_
destroy
(&split_vars);
+ subcase_
uninit
(&split_vars);
while (casegrouper_get_next_group (split_grouper, &split_group))
{
struct casereader *ordered;
while (casegrouper_get_next_group (split_grouper, &split_group))
{
struct casereader *ordered;
@@
-1081,8
+1081,8
@@
rank_cmd (struct dataset *ds, const struct rank *cmd)
rank_sorted_file (by_group, outputs[i], weight_idx, cmd);
ok = casegrouper_destroy (by_grouper) && ok;
}
rank_sorted_file (by_group, outputs[i], weight_idx, cmd);
ok = casegrouper_destroy (by_grouper) && ok;
}
- subcase_
destroy
(&group_vars);
- subcase_
destroy
(&rank_ordering);
+ subcase_
uninit
(&group_vars);
+ subcase_
uninit
(&rank_ordering);
ok = casegrouper_destroy (split_grouper) && ok;
}
ok = casegrouper_destroy (split_grouper) && ok;
}