X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fsort.c;h=13642e00ea7b8c0f84e71c2c8c54adec9ed111ad;hb=577812dc389ab344cc7ad83cc826f7066786b99b;hp=a93466f27c8386cfa1692d2ff349d316197e3c65;hpb=cbab34f8cd28876f9b1d67d2ad10b312181bf2f6;p=pspp 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); }