projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced use of errno with assert
[pspp]
/
src
/
oneway.q
diff --git
a/src/oneway.q
b/src/oneway.q
index aa45fbed6572edad9967c73859ed3e8e52c61b69..8c9c768a87bc6266e5b849521c8e6c0db3cbf26b 100644
(file)
--- a/
src/oneway.q
+++ b/
src/oneway.q
@@
-43,6
+43,10
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
#include "group_proc.h"
#include "group.h"
#include "levene.h"
#include "group_proc.h"
#include "group.h"
#include "levene.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* (headers) */
/* (specification)
/* (headers) */
/* (specification)
@@
-83,7
+87,7
@@
static int ostensible_number_of_groups=-1;
/* Function to use for testing for missing values */
/* Function to use for testing for missing values */
-static is_missing_func value_is_missing;
+static is_missing_func
*
value_is_missing;
static void run_oneway(const struct casefile *cf, void *_mode);
static void run_oneway(const struct casefile *cf, void *_mode);
@@
-115,9
+119,9
@@
cmd_oneway(void)
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == ONEWAY_INCLUDE )
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == ONEWAY_INCLUDE )
- value_is_missing =
is
_system_missing;
+ value_is_missing =
mv_is_value
_system_missing;
else
else
- value_is_missing =
is
_missing;
+ value_is_missing =
mv_is_value
_missing;
/* What statistics were requested */
if ( cmd.sbc_statistics )
/* What statistics were requested */
if ( cmd.sbc_statistics )
@@
-909,7
+913,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
const union value *indep_val = case_data (&c, indep_var->fv);
/* Deal with missing values */
const union value *indep_val = case_data (&c, indep_var->fv);
/* Deal with missing values */
- if ( value_is_missing(
indep_val,indep_var
) )
+ if ( value_is_missing(
&indep_var->miss, indep_val
) )
continue;
/* Skip the entire case if /MISSING=LISTWISE is set */
continue;
/* Skip the entire case if /MISSING=LISTWISE is set */
@@
-920,7
+924,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
const struct variable *v = vars[i];
const union value *val = case_data (&c, v->fv);
const struct variable *v = vars[i];
const union value *val = case_data (&c, v->fv);
- if (value_is_missing(
val,v
) )
+ if (value_is_missing(
&v->miss, val
) )
break;
}
if ( i != n_vars )
break;
}
if ( i != n_vars )
@@
-960,7
+964,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
hsh_insert ( group_hash, (void *) gs );
}
hsh_insert ( group_hash, (void *) gs );
}
- if (! value_is_missing(
val,v
) )
+ if (! value_is_missing(
&v->miss, val
) )
{
struct group_statistics *totals = &gp->ugs;
{
struct group_statistics *totals = &gp->ugs;