Clean up treatment of missing values by moving all the code into

[pspp-builds.git] / src / get.c

diff --git a/src/get.c b/src/get.c
index a13277a6bf4676ccc0125d1bf846e5f50b9a25a4..f484d120fc756dda1d700f4aa583c5cc470c7a4e 100644 (file)
--- a/src/get.c
+++ b/src/get.c
@@ -1426,9 +1426,8 @@ mtf_merge_dictionary (struct dictionary *const m, struct mtf_file *f)
               if (val_labs_count (dv->val_labs)
                   && !val_labs_count (mv->val_labs))
                 mv->val_labs = val_labs_copy (dv->val_labs);
-              if (dv->miss_type != MISSING_NONE
-                  && mv->miss_type == MISSING_NONE)
-                copy_missing_values (mv, dv);
+              if (!mv_is_empty (&dv->miss) && mv_is_empty (&mv->miss))
+                mv_copy (&mv->miss, &dv->miss);
             }
 
           if (dv->label && !mv->label)