projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent test failure when non-English language selected
[pspp]
/
src
/
language
/
stats
/
oneway.q
diff --git
a/src/language/stats/oneway.q
b/src/language/stats/oneway.q
index b2e77f45d06a29ba3f4574406232b9f606ea28fb..be57eb24d5fbf6ac9830f5582655bd1028f89f30 100644
(file)
--- a/
src/language/stats/oneway.q
+++ b/
src/language/stats/oneway.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007
, 2009
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-894,15
+894,16
@@
run_oneway (struct cmd_oneway *cmd,
struct dictionary *dict = dataset_dict (ds);
enum mv_class exclude;
struct casereader *reader;
struct dictionary *dict = dataset_dict (ds);
enum mv_class exclude;
struct casereader *reader;
- struct ccase c;
+ struct ccase
*
c;
- if (!casereader_peek (input, 0, &c))
+ c = casereader_peek (input, 0);
+ if (c == NULL)
{
casereader_destroy (input);
return;
}
{
casereader_destroy (input);
return;
}
- output_split_file_values (ds,
&
c);
- case_
destroy (&
c);
+ output_split_file_values (ds, c);
+ case_
unref (
c);
taint = taint_clone (casereader_get_taint (input));
taint = taint_clone (casereader_get_taint (input));
@@
-923,13
+924,13
@@
run_oneway (struct cmd_oneway *cmd,
input = casereader_create_filter_weight (input, dict, NULL, NULL);
reader = casereader_clone (input);
input = casereader_create_filter_weight (input, dict, NULL, NULL);
reader = casereader_clone (input);
- for (;
casereader_read (reader, &c); case_destroy (&
c))
+ for (;
(c = casereader_read (reader)) != NULL; case_unref (
c))
{
size_t i;
{
size_t i;
- const double weight = dict_get_case_weight (dict,
&
c, NULL);
+ const double weight = dict_get_case_weight (dict, c, NULL);
- const union value *indep_val = case_data (
&
c, indep_var);
+ const union value *indep_val = case_data (c, indep_var);
void **p = hsh_probe (global_group_hash, indep_val);
if (*p == NULL)
*p = value_dup (indep_val, var_get_width (indep_var));
void **p = hsh_probe (global_group_hash, indep_val);
if (*p == NULL)
*p = value_dup (indep_val, var_get_width (indep_var));
@@
-938,7
+939,7
@@
run_oneway (struct cmd_oneway *cmd,
{
const struct variable *v = vars[i];
{
const struct variable *v = vars[i];
- const union value *val = case_data (
&
c, v);
+ const union value *val = case_data (c, v);
struct group_proc *gp = group_proc_get (vars[i]);
struct hsh_table *group_hash = gp->group_hash;
struct group_proc *gp = group_proc_get (vars[i]);
struct hsh_table *group_hash = gp->group_hash;