X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foneway.q;h=f413cda15410af5bc0bcd269cfb64c03fbd676c4;hb=d7b5d9144738a5a8989d45a01f4e458a78b68c0b;hp=aa45fbed6572edad9967c73859ed3e8e52c61b69;hpb=9e41822d23f3c62349751e172a946e832c4a96eb;p=pspp

diff --git a/src/oneway.q b/src/oneway.q
index aa45fbed65..f413cda154 100644
--- 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 "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* (headers) */
 
 /* (specification)
@@ -67,7 +71,7 @@ static struct cmd_oneway cmd;
 static struct variable *indep_var;
 
 /* Number of dependent variables */
-static int n_vars;
+static size_t n_vars;
 
 /* The dependent variables */
 static struct variable **vars;
@@ -83,7 +87,7 @@ static int ostensible_number_of_groups=-1;
 
 
 /* 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);
@@ -115,9 +119,9 @@ cmd_oneway(void)
 
   /* 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
-    value_is_missing = is_missing;
+    value_is_missing = mv_is_value_missing;
 
   /* What statistics were requested */
   if ( cmd.sbc_statistics ) 
@@ -150,11 +154,10 @@ cmd_oneway(void)
 void
 output_oneway(void)
 {
-
-  int i;
+  size_t i;
   short *bad_contrast ; 
 
-  bad_contrast = xmalloc ( sizeof (short) * cmd.sbc_contrast );
+  bad_contrast = xnmalloc (cmd.sbc_contrast, sizeof *bad_contrast);
 
   /* Check the sanity of the given contrast values */
   for (i = 0 ; i < cmd.sbc_contrast ; ++i ) 
@@ -254,9 +257,9 @@ oneway_custom_variables(struct cmd_oneway *cmd UNUSED)
 static void  
 show_anova_table(void)
 {
-  int i;
+  size_t i;
   int n_cols =7;
-  int n_rows = n_vars * 3 + 1;
+  size_t n_rows = n_vars * 3 + 1;
 
   struct tab_table *t;
 
@@ -360,7 +363,7 @@ show_anova_table(void)
 static void  
 show_descriptives(void)
 {
-  int v;
+  size_t v;
   int n_cols =10;
   struct tab_table *t;
   int row;
@@ -507,9 +510,9 @@ show_descriptives(void)
 static void 
 show_homogeneity(void)
 {
-  int v;
+  size_t v;
   int n_cols = 5;
-  int n_rows = n_vars + 1;
+  size_t n_rows = n_vars + 1;
 
   struct tab_table *t;
 
@@ -646,9 +649,9 @@ show_contrast_coeffs(short *bad_contrast)
 static void 
 show_contrast_tests(short *bad_contrast)
 {
-  int v;
+  size_t v;
   int n_cols = 8;
-  int n_rows = 1 + n_vars * 2 * cmd.sbc_contrast;
+  size_t n_rows = 1 + n_vars * 2 * cmd.sbc_contrast;
 
   struct tab_table *t;
 
@@ -853,7 +856,7 @@ static void  precalc ( struct cmd_oneway *cmd UNUSED );
 static void 
 precalc ( struct cmd_oneway *cmd UNUSED )
 {
-  int i=0;
+  size_t i=0;
 
   for(i=0; i< n_vars ; ++i) 
     {
@@ -901,7 +904,7 @@ run_oneway(const struct casefile *cf, void *cmd_)
       casereader_read (r, &c) ;
       case_destroy (&c)) 
     {
-      int i;
+      size_t i;
 
       const double weight = 
 	dict_get_case_weight(default_dict,&c,&bad_weight_warn);
@@ -909,7 +912,7 @@ run_oneway(const struct casefile *cf, void *cmd_)
       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 */
@@ -920,7 +923,7 @@ run_oneway(const struct casefile *cf, void *cmd_)
 	      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 ) 
@@ -946,9 +949,7 @@ run_oneway(const struct casefile *cf, void *cmd_)
 
 	  if ( ! gs ) 
 	    {
-	      gs = (struct group_statistics *) 
-		xmalloc (sizeof(struct group_statistics));
-
+	      gs = xmalloc (sizeof *gs);
 	      gs->id = *indep_val;
 	      gs->sum=0;
 	      gs->n=0;
@@ -960,7 +961,7 @@ run_oneway(const struct casefile *cf, void *cmd_)
 	      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;
 
@@ -1012,7 +1013,7 @@ run_oneway(const struct casefile *cf, void *cmd_)
 void 
 postcalc (  struct cmd_oneway *cmd UNUSED )
 {
-  int i=0;
+  size_t i=0;
 
 
   for(i = 0; i < n_vars ; ++i)