projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change explicit variable name checks into use of dict_class_from_id().
[pspp]
/
src
/
frequencies.q
diff --git
a/src/frequencies.q
b/src/frequencies.q
index 44393a89bbe765ad473afaa63a1af1a4cc72a9f5..66faf5ef027e2608914a0a9b2927bedbe5831ee7 100644
(file)
--- a/
src/frequencies.q
+++ b/
src/frequencies.q
@@
-518,6
+518,8
@@
get_freq_comparator (int frq_sort, int var_type)
return 0;
}
return 0;
}
+/* Returns nonzero iff the value in struct freq F is non-missing
+ for variable V. */
static int
not_missing (const void *f_, void *v_)
{
static int
not_missing (const void *f_, void *v_)
{
@@
-527,8
+529,9
@@
not_missing (const void *f_, void *v_)
return !is_missing (&f->v, v);
}
return !is_missing (&f->v, v);
}
+/* Summarizes the frequency table data for variable V. */
static void
static void
-postprocess_freq_tab (struct variable *
v)
+postprocess_freq_tab (struct variable *v)
{
hsh_compare_func *compare;
struct freq_tab *ft;
{
hsh_compare_func *compare;
struct freq_tab *ft;
@@
-575,11
+578,13
@@
postprocess_freq_tab (struct variable * v)
}
}
}
}
+/* Frees the frequency table for variable V. */
static void
cleanup_freq_tab (struct variable *v)
{
assert (v->p.frq.tab.mode == FRQM_GENERAL);
free (v->p.frq.tab.valid);
static void
cleanup_freq_tab (struct variable *v)
{
assert (v->p.frq.tab.mode == FRQM_GENERAL);
free (v->p.frq.tab.valid);
+ hsh_destroy (v->p.frq.tab.data);
}
/* Parses the VARIABLES subcommand, adding to
}
/* Parses the VARIABLES subcommand, adding to
@@
-588,7
+593,7
@@
static int
frq_custom_variables (struct cmd_frequencies *cmd UNUSED)
{
int mode;
frq_custom_variables (struct cmd_frequencies *cmd UNUSED)
{
int mode;
- int min
, max
;
+ int min
= 0, max = 0
;
int old_n_variables = n_variables;
int i;
int old_n_variables = n_variables;
int i;
@@
-715,8
+720,11
@@
frq_custom_grouped (struct cmd_frequencies *cmd UNUSED)
return 0;
}
}
return 0;
}
}
- else
- nl = 0;
+ else
+ {
+ nl = 0;
+ dl = NULL;
+ }
for (i = 0; i < n; i++)
{
for (i = 0; i < n; i++)
{