X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvfm.c;h=6d7e526bf1a5d66a015eb3658e4dd22184f2264b;hb=1f8dd363d6c20d07fcca14cb948018465fa5ed8b;hp=6944df2b7d530f287cc5278a3bc392ae47f4fc4f;hpb=12f1ba95a6eb660bf60b8e6a1bb09ecffee16630;p=pspp-builds.git diff --git a/src/vfm.c b/src/vfm.c index 6944df2b..6d7e526b 100644 --- a/src/vfm.c +++ b/src/vfm.c @@ -42,6 +42,9 @@ #include "var.h" #include "value-labels.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) + /* Virtual File Manager (vfm): @@ -259,7 +262,8 @@ write_case (struct write_case_data *wc_data) { if (compaction_necessary) { - dict_compact_case (temp_dict, &wc_data->sink_case, &wc_data->trns_case); + dict_compact_case (temp_dict, &wc_data->sink_case, + &wc_data->trns_case); vfm_sink->class->write (vfm_sink, &wc_data->sink_case); } else @@ -332,7 +336,7 @@ filter_case (const struct ccase *c, int case_idx) if (filter_var != NULL) { double f = case_num (c, filter_var->fv); - if (f == 0.0 || f == SYSMIS || is_num_user_missing (f, filter_var)) + if (f == 0.0 || mv_is_num_missing (&filter_var->miss, f)) return 1; } @@ -405,11 +409,8 @@ close_active_file (void) dict_compact_values (default_dict); /* Free data source. */ - if (vfm_source != NULL) - { - free_case_source (vfm_source); - vfm_source = NULL; - } + free_case_source (vfm_source); + vfm_source = NULL; /* Old data sink becomes new data source. */ if (vfm_sink->class->make_source != NULL) @@ -626,7 +627,7 @@ cancel_transformations (void) } n_trns = f_trns = 0; free (t_trns); - t_trns=NULL; + t_trns = NULL; m_trns = 0; }