From 577812dc389ab344cc7ad83cc826f7066786b99b Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 29 Jan 2022 12:21:13 -0800 Subject: [PATCH] subcase: Rename subcase_destroy() to subcase_uninit(). This reflects the convention that "destroy" frees the pointer passed in while "uninit" only frees the internals. --- src/data/case-matcher.c | 2 +- src/data/casegrouper.c | 2 +- src/data/casereader-project.c | 6 +++--- src/data/subcase.c | 2 +- src/data/subcase.h | 2 +- src/language/data-io/combine-files.c | 8 ++++---- src/language/data-io/list.c | 2 +- src/language/stats/aggregate.c | 4 ++-- src/language/stats/examine.c | 2 +- src/language/stats/graph.c | 4 ++-- src/language/stats/median.c | 2 +- src/language/stats/rank.c | 14 +++++++------- src/language/stats/roc.c | 6 +++--- src/language/stats/runs.c | 2 +- src/language/stats/sort-cases.c | 2 +- src/language/stats/wilcoxon.c | 2 +- src/math/merge.c | 2 +- src/math/sort.c | 6 +++--- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/data/case-matcher.c b/src/data/case-matcher.c index 46272bbed6..e1ad48fde0 100644 --- a/src/data/case-matcher.c +++ b/src/data/case-matcher.c @@ -102,7 +102,7 @@ case_matcher_destroy (struct case_matcher *cm) for (i = 0; i < cm->n_inputs; i++) { struct case_matcher_input *input = &cm->inputs[i]; - subcase_destroy (&input->by_vars); + subcase_uninit (&input->by_vars); } free (cm->inputs); free (cm); diff --git a/src/data/casegrouper.c b/src/data/casegrouper.c index 23afffbcab..d4993b4952 100644 --- a/src/data/casegrouper.c +++ b/src/data/casegrouper.c @@ -242,7 +242,7 @@ casegrouper_vars_destroy (void *sc_) struct subcase *sc = sc_; if (sc != NULL) { - subcase_destroy (sc); + subcase_uninit (sc); free (sc); } } diff --git a/src/data/casereader-project.c b/src/data/casereader-project.c index d3d560f208..2798eeb80c 100644 --- a/src/data/casereader-project.c +++ b/src/data/casereader-project.c @@ -57,8 +57,8 @@ static bool destroy_projection (void *project_) { struct casereader_project *project = project_; - subcase_destroy (&project->old_sc); - subcase_destroy (&project->new_sc); + subcase_uninit (&project->old_sc); + subcase_uninit (&project->new_sc); free (project); return true; } @@ -99,7 +99,7 @@ casereader_project_1 (struct casereader *subreader, int column) subcase_init (&sc, column, caseproto_get_width (subproto, column), SC_ASCEND); reader = casereader_project (subreader, &sc); - subcase_destroy (&sc); + subcase_uninit (&sc); return reader; } diff --git a/src/data/subcase.c b/src/data/subcase.c index d7f2780e9e..ca4992ae60 100644 --- a/src/data/subcase.c +++ b/src/data/subcase.c @@ -86,7 +86,7 @@ subcase_clone (struct subcase *sc, const struct subcase *orig) /* Frees the memory owned by SC (but not SC itself). */ void -subcase_destroy (struct subcase *sc) +subcase_uninit (struct subcase *sc) { free (sc->fields); caseproto_unref (sc->proto); diff --git a/src/data/subcase.h b/src/data/subcase.h index f890f2549a..4e5043648c 100644 --- a/src/data/subcase.h +++ b/src/data/subcase.h @@ -58,7 +58,7 @@ void subcase_init (struct subcase *, int index, int width, void subcase_clone (struct subcase *, const struct subcase *); void subcase_clear (struct subcase *); -void subcase_destroy (struct subcase *); +void subcase_uninit (struct subcase *); bool subcase_contains (const struct subcase *, int case_index); bool subcase_contains_var (const struct subcase *, const struct variable *); diff --git a/src/language/data-io/combine-files.c b/src/language/data-io/combine-files.c index 8322f5c033..27e511595e 100644 --- a/src/language/data-io/combine-files.c +++ b/src/language/data-io/combine-files.c @@ -639,9 +639,9 @@ close_all_comb_files (struct comb_proc *proc) for (i = 0; i < proc->n_files; i++) { struct comb_file *file = &proc->files[i]; - subcase_destroy (&file->by_vars); - subcase_destroy (&file->src); - subcase_destroy (&file->dst); + subcase_uninit (&file->by_vars); + subcase_uninit (&file->src); + subcase_uninit (&file->dst); free (file->mv); fh_unref (file->handle); dict_unref (file->dict); @@ -668,7 +668,7 @@ free_comb_proc (struct comb_proc *proc) proc->prev_BY); free (proc->prev_BY); } - subcase_destroy (&proc->by_vars); + subcase_uninit (&proc->by_vars); case_unref (proc->buffered_case); } diff --git a/src/language/data-io/list.c b/src/language/data-io/list.c index d84746506b..c98b6f9a52 100644 --- a/src/language/data-io/list.c +++ b/src/language/data-io/list.c @@ -131,7 +131,7 @@ list_execute (const struct lst_cmd *lcmd, struct dataset *ds) ok = casegrouper_destroy (grouper); ok = proc_commit (ds) && ok; - subcase_destroy (&sc); + subcase_uninit (&sc); free (lcmd->v_variables); return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE; diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c index 721dba73d3..640746991c 100644 --- a/src/language/stats/aggregate.c +++ b/src/language/stats/aggregate.c @@ -708,7 +708,7 @@ agr_destroy (struct agr_proc *agr) { struct agr_var *iter, *next; - subcase_destroy (&agr->sort); + subcase_uninit (&agr->sort); free (agr->break_vars); for (iter = agr->agr_vars; iter; iter = next) { @@ -1119,7 +1119,7 @@ initialize_aggregate_info (struct agr_proc *agr) subcase_init_var (&ordering, iter->subject, SC_ASCEND); iter->writer = sort_create_writer (&ordering, proto); - subcase_destroy (&ordering); + subcase_uninit (&ordering); caseproto_unref (proto); iter->cc = 0; diff --git a/src/language/stats/examine.c b/src/language/stats/examine.c index 4dbafce320..19c42fcad5 100644 --- a/src/language/stats/examine.c +++ b/src/language/stats/examine.c @@ -1033,7 +1033,7 @@ create_n (const void *aux1, void *aux2 UNUSED) es[v].minimum = DBL_MAX; } - subcase_destroy (&ordering); + subcase_uninit (&ordering); return es; } diff --git a/src/language/stats/graph.c b/src/language/stats/graph.c index 7496b0f0dd..8157bb2958 100644 --- a/src/language/stats/graph.c +++ b/src/language/stats/graph.c @@ -977,7 +977,7 @@ cmd_graph (struct lexer *lexer, struct dataset *ds) ok = proc_commit (ds) && ok; } - subcase_destroy (&graph.ordering); + subcase_uninit (&graph.ordering); free (graph.dep_vars); pool_destroy (graph.pool); caseproto_unref (graph.gr_proto); @@ -985,7 +985,7 @@ cmd_graph (struct lexer *lexer, struct dataset *ds) return CMD_SUCCESS; error: - subcase_destroy (&graph.ordering); + subcase_uninit (&graph.ordering); caseproto_unref (graph.gr_proto); free (graph.dep_vars); pool_destroy (graph.pool); diff --git a/src/language/stats/median.c b/src/language/stats/median.c index 93ba08e210..c15108896b 100644 --- a/src/language/stats/median.c +++ b/src/language/stats/median.c @@ -168,7 +168,7 @@ median_execute (const struct dataset *ds, 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); diff --git a/src/language/stats/rank.c b/src/language/stats/rank.c index 7e76d68aba..af0eb21538 100644 --- 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); - subcase_destroy (&rank->sc); + subcase_uninit (&rank->sc); 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); - subcase_destroy (&input_var); + subcase_uninit (&input_var); 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); - subcase_destroy (&by_order); + subcase_uninit (&by_order); 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); - subcase_destroy (&projection); + subcase_uninit (&projection); /* 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); - subcase_destroy (&split_vars); + subcase_uninit (&split_vars); 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; } - subcase_destroy (&group_vars); - subcase_destroy (&rank_ordering); + subcase_uninit (&group_vars); + subcase_uninit (&rank_ordering); ok = casegrouper_destroy (split_grouper) && ok; } diff --git a/src/language/stats/roc.c b/src/language/stats/roc.c index 031110a046..8b5cc3d049 100644 --- a/src/language/stats/roc.c +++ b/src/language/stats/roc.c @@ -664,7 +664,7 @@ prepare_cutpoints (struct cmd_roc *roc, struct roc_state *rs, struct casereader } caseproto_unref (proto); - subcase_destroy (&ordering); + subcase_uninit (&ordering); } for (; (c = casereader_read (r)) != NULL; case_unref (c)) @@ -945,8 +945,8 @@ do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) casereader_destroy (negatives); caseproto_unref (n_proto); - subcase_destroy (&up_ordering); - subcase_destroy (&down_ordering); + subcase_uninit (&up_ordering); + subcase_uninit (&down_ordering); output_roc (rs, roc); diff --git a/src/language/stats/runs.c b/src/language/stats/runs.c index b42eeafcec..8a63b29c96 100644 --- a/src/language/stats/runs.c +++ b/src/language/stats/runs.c @@ -201,7 +201,7 @@ runs_execute (const struct dataset *ds, cc += w; casewriter_write (writer, c); } - subcase_destroy (&sc); + subcase_uninit (&sc); casereader_destroy (reader); reader = casewriter_make_reader (writer); diff --git a/src/language/stats/sort-cases.c b/src/language/stats/sort-cases.c index 069451510d..4b6b1ebec3 100644 --- a/src/language/stats/sort-cases.c +++ b/src/language/stats/sort-cases.c @@ -71,7 +71,7 @@ cmd_sort_cases (struct lexer *lexer, struct dataset *ds) min_buffers = 64; max_buffers = INT_MAX; - subcase_destroy (&ordering); + subcase_uninit (&ordering); return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE; } diff --git a/src/language/stats/wilcoxon.c b/src/language/stats/wilcoxon.c index 775e63ef4a..e1fb14f015 100644 --- a/src/language/stats/wilcoxon.c +++ b/src/language/stats/wilcoxon.c @@ -116,7 +116,7 @@ wilcoxon_execute (const struct dataset *ds, subcase_init_var (&ordering, ws[i].absdiff, SC_ASCEND); writer = sort_create_writer (&ordering, proto); - subcase_destroy (&ordering); + subcase_uninit (&ordering); for (; (c = casereader_read (r)) != NULL; case_unref (c)) { diff --git a/src/math/merge.c b/src/math/merge.c index c9ef201e88..e2f2d49570 100644 --- a/src/math/merge.c +++ b/src/math/merge.c @@ -66,7 +66,7 @@ merge_destroy (struct merge *m) { size_t i; - subcase_destroy (&m->ordering); + subcase_uninit (&m->ordering); for (i = 0; i < m->n_inputs; i++) casereader_destroy (m->inputs[i].reader); caseproto_unref (m->proto); diff --git a/src/math/sort.c b/src/math/sort.c index a93466f27c..13642e00ea 100644 --- a/src/math/sort.c +++ b/src/math/sort.c @@ -102,7 +102,7 @@ sort_casewriter_destroy (struct casewriter *writer UNUSED, void *sort_) { struct sort_writer *sort = sort_; - subcase_destroy (&sort->ordering); + subcase_uninit (&sort->ordering); merge_destroy (sort->merge); pqueue_destroy (sort->pqueue); casewriter_destroy (sort->run); @@ -192,7 +192,7 @@ sort_execute_1var (struct casereader *input, const struct variable *var) subcase_init_var (&sc, var, SC_ASCEND); reader = sort_execute (input, &sc); - subcase_destroy (&sc); + subcase_uninit (&sc); return reader; } @@ -247,7 +247,7 @@ pqueue_destroy (struct pqueue *pq) struct ccase *c = pqueue_pop (pq, &id); case_unref (c); } - subcase_destroy (&pq->ordering); + subcase_uninit (&pq->ordering); free (pq->records); free (pq); } -- 2.30.2