X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcasereader-filter.c;h=36ff62acec9c1cf3bc4ace2a109a41cccc03e115;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=d06bdc86c3101a3f30d4145d0b22deaa2b7b53af;hpb=dc78471910e82d59232ce9b137b7c4fc4992d174;p=pspp diff --git a/src/data/casereader-filter.c b/src/data/casereader-filter.c index d06bdc86c3..36ff62acec 100644 --- a/src/data/casereader-filter.c +++ b/src/data/casereader-filter.c @@ -34,7 +34,7 @@ #include "gettext.h" #define _(msgid) gettext (msgid) -struct casereader_filter +struct casereader_filter { struct casereader *subreader; bool (*include) (const struct ccase *, void *aux); @@ -51,7 +51,7 @@ casereader_create_filter_func (struct casereader *subreader, void *aux), bool (*destroy) (void *aux), void *aux, - struct casewriter *exclude) + struct casewriter *exclude) { struct casereader_filter *filter = xmalloc (sizeof *filter); struct casereader *reader; @@ -70,7 +70,7 @@ casereader_create_filter_func (struct casereader *subreader, static bool casereader_filter_read (struct casereader *reader UNUSED, void *filter_, - struct ccase *c) + struct ccase *c) { struct casereader_filter *filter = filter_; @@ -78,17 +78,17 @@ casereader_filter_read (struct casereader *reader UNUSED, void *filter_, { if (!casereader_read (filter->subreader, c)) return false; - else if (filter->include (c, filter->aux)) + else if (filter->include (c, filter->aux)) return true; else if (filter->exclude != NULL) casewriter_write (filter->exclude, c); else - case_destroy (c); + case_destroy (c); } } static void -casereader_filter_destroy (struct casereader *reader, void *filter_) +casereader_filter_destroy (struct casereader *reader, void *filter_) { struct casereader_filter *filter = filter_; casereader_destroy (filter->subreader); @@ -97,7 +97,7 @@ casereader_filter_destroy (struct casereader *reader, void *filter_) free (filter); } -static struct casereader_class casereader_filter_class = +static struct casereader_class casereader_filter_class = { casereader_filter_read, casereader_filter_destroy, @@ -111,7 +111,7 @@ static struct casereader_class casereader_filter_class = NULL, }; -struct casereader_filter_weight +struct casereader_filter_weight { const struct variable *weight_var; bool *warn_on_invalid; @@ -119,7 +119,7 @@ struct casereader_filter_weight }; static bool -casereader_filter_weight_include (const struct ccase *c, void *cfw_) +casereader_filter_weight_include (const struct ccase *c, void *cfw_) { struct casereader_filter_weight *cfw = cfw_; double value = case_num (c, cfw->weight_var); @@ -127,7 +127,7 @@ casereader_filter_weight_include (const struct ccase *c, void *cfw_) return true; else { - if (*cfw->warn_on_invalid) + if (*cfw->warn_on_invalid) { msg (SW, _("At least one case in the data read had a weight value " "that was user-missing, system-missing, zero, or " @@ -139,7 +139,7 @@ casereader_filter_weight_include (const struct ccase *c, void *cfw_) } static bool -casereader_filter_weight_destroy (void *cfw_) +casereader_filter_weight_destroy (void *cfw_) { struct casereader_filter_weight *cfw = cfw_; free (cfw); @@ -150,10 +150,10 @@ struct casereader * casereader_create_filter_weight (struct casereader *reader, const struct dictionary *dict, bool *warn_on_invalid, - struct casewriter *exclude) + struct casewriter *exclude) { struct variable *weight_var = dict_get_weight (dict); - if (weight_var != NULL) + if (weight_var != NULL) { struct casereader_filter_weight *cfw = xmalloc (sizeof *cfw); cfw->weight_var = weight_var; @@ -171,7 +171,7 @@ casereader_create_filter_weight (struct casereader *reader, return reader; } -struct casereader_filter_missing +struct casereader_filter_missing { struct variable **vars; size_t var_cnt; @@ -179,7 +179,7 @@ struct casereader_filter_missing }; static bool -casereader_filter_missing_include (const struct ccase *c, void *cfm_) +casereader_filter_missing_include (const struct ccase *c, void *cfm_) { const struct casereader_filter_missing *cfm = cfm_; size_t i; @@ -195,7 +195,7 @@ casereader_filter_missing_include (const struct ccase *c, void *cfm_) } static bool -casereader_filter_missing_destroy (void *cfm_) +casereader_filter_missing_destroy (void *cfm_) { struct casereader_filter_missing *cfm = cfm_; free (cfm->vars); @@ -207,9 +207,9 @@ struct casereader * casereader_create_filter_missing (struct casereader *reader, const struct variable **vars, size_t var_cnt, enum mv_class class, - struct casewriter *exclude) + struct casewriter *exclude) { - if (var_cnt > 0 && class != MV_NEVER) + if (var_cnt > 0 && class != MV_NEVER) { struct casereader_filter_missing *cfm = xmalloc (sizeof *cfm); cfm->vars = xmemdup (vars, sizeof *vars * var_cnt); @@ -227,7 +227,7 @@ casereader_create_filter_missing (struct casereader *reader, static bool -casereader_counter_include (const struct ccase *c UNUSED, void *counter_) +casereader_counter_include (const struct ccase *c UNUSED, void *counter_) { casenumber *counter = counter_; ++*counter; @@ -236,7 +236,7 @@ casereader_counter_include (const struct ccase *c UNUSED, void *counter_) struct casereader * casereader_create_counter (struct casereader *reader, casenumber *counter, - casenumber initial_value) + casenumber initial_value) { *counter = initial_value; return casereader_create_filter_func (reader, casereader_counter_include,