projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change type of variables whose addresses are passed to dict_get_vars()
[pspp-builds.git]
/
src
/
vfm.c
diff --git
a/src/vfm.c
b/src/vfm.c
index 90edfcd02694cc74aed682ad7ac8fccc04bedeea..6d7e526bf1a5d66a015eb3658e4dd22184f2264b 100644
(file)
--- a/
src/vfm.c
+++ b/
src/vfm.c
@@
-42,6
+42,9
@@
#include "var.h"
#include "value-labels.h"
#include "var.h"
#include "value-labels.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/*
Virtual File Manager (vfm):
/*
Virtual File Manager (vfm):
@@
-259,7
+262,8
@@
write_case (struct write_case_data *wc_data)
{
if (compaction_necessary)
{
{
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
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 (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;
}
return 1;
}
@@
-405,11
+409,8
@@
close_active_file (void)
dict_compact_values (default_dict);
/* Free data source. */
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)
/* Old data sink becomes new data source. */
if (vfm_sink->class->make_source != NULL)