X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fcombine-files.c;h=27e511595e04f205ce4a4abef7063260ce822d8e;hb=4210c4336dee5e6f59481dadc645af0422be1acf;hp=490a984a7dc98370b346a237314de63dd147dac0;hpb=339f1956cc727eda788638644ef93ab7852b31cd;p=pspp

diff --git a/src/language/data-io/combine-files.c b/src/language/data-io/combine-files.c
index 490a984a7d..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);
 }
 
@@ -873,7 +873,7 @@ apply_nonmissing_case (const struct comb_file *file, struct ccase *output)
         = case_data_idx (file->data, src_field->case_index);
       int width = src_field->width;
 
-      if (!mv_is_value_missing (file->mv[i], src_value, MV_ANY)
+      if (!mv_is_value_missing (file->mv[i], src_value)
           && !(width > 0 && value_is_spaces (src_value, width)))
         value_copy (case_data_rw_idx (output, dst_field->case_index),
                     src_value, width);