projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subcase: Rename subcase_destroy() to subcase_uninit().
[pspp]
/
src
/
language
/
stats
/
graph.c
diff --git
a/src/language/stats/graph.c
b/src/language/stats/graph.c
index 425fd241574d76227d7cb2830dd11aa832307900..8157bb295887c762f2362005b6e8f4bfcb474dcf 100644
(file)
--- a/
src/language/stats/graph.c
+++ b/
src/language/stats/graph.c
@@
-240,7
+240,7
@@
parse_function (struct lexer *lexer, struct graph *graph)
if (!lex_force_match (lexer, T_LPAREN))
goto error;
if (!lex_force_match (lexer, T_LPAREN))
goto error;
- graph->dep_vars = x
zalloc (sizeof (graph->dep_vars) * graph->n_dep_vars
);
+ graph->dep_vars = x
calloc (graph->n_dep_vars, sizeof (graph->dep_vars)
);
for (v = 0; v < ag_func[i].arity; ++v)
{
graph->dep_vars[v] = parse_variable (lexer, graph->dict);
for (v = 0; v < ag_func[i].arity; ++v)
{
graph->dep_vars[v] = parse_variable (lexer, graph->dict);
@@
-430,8
+430,8
@@
run_barchart (struct graph *cmd, struct casereader *input)
for (v = 0; v < cmd->n_by_vars; ++v)
{
if (var_is_value_missing (cmd->by_var[v],
for (v = 0; v < cmd->n_by_vars; ++v)
{
if (var_is_value_missing (cmd->by_var[v],
- case_data (c, cmd->by_var[v])
,
-
cmd->fctr_excl)
)
+ case_data (c, cmd->by_var[v])
)
+
& cmd->fctr_excl
)
break;
}
break;
}
@@
-619,7
+619,7
@@
run_graph (struct graph *cmd, struct casereader *input)
const struct variable *var = cmd->dep_vars[v];
const double x = case_num (c, var);
const struct variable *var = cmd->dep_vars[v];
const double x = case_num (c, var);
- if (var_is_value_missing (var, case_data (c, var)
, cmd->dep_excl)
)
+ if (var_is_value_missing (var, case_data (c, var)
) & cmd->dep_excl
)
{
cmd->es[v].missing += weight;
continue;
{
cmd->es[v].missing += weight;
continue;
@@
-908,7
+908,7
@@
cmd_graph (struct lexer *lexer, struct dataset *ds)
}
else if (lex_match_id (lexer, "REPORT"))
{
}
else if (lex_match_id (lexer, "REPORT"))
{
- graph.fctr_excl =
MV_NEVER
;
+ graph.fctr_excl =
0
;
}
else if (lex_match_id (lexer, "NOREPORT"))
{
}
else if (lex_match_id (lexer, "NOREPORT"))
{
@@
-977,7
+977,7
@@
cmd_graph (struct lexer *lexer, struct dataset *ds)
ok = proc_commit (ds) && ok;
}
ok = proc_commit (ds) && ok;
}
- subcase_
destroy
(&graph.ordering);
+ subcase_
uninit
(&graph.ordering);
free (graph.dep_vars);
pool_destroy (graph.pool);
caseproto_unref (graph.gr_proto);
free (graph.dep_vars);
pool_destroy (graph.pool);
caseproto_unref (graph.gr_proto);
@@
-985,7
+985,7
@@
cmd_graph (struct lexer *lexer, struct dataset *ds)
return CMD_SUCCESS;
error:
return CMD_SUCCESS;
error:
- subcase_
destroy
(&graph.ordering);
+ subcase_
uninit
(&graph.ordering);
caseproto_unref (graph.gr_proto);
free (graph.dep_vars);
pool_destroy (graph.pool);
caseproto_unref (graph.gr_proto);
free (graph.dep_vars);
pool_destroy (graph.pool);