X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ft-test.q;h=5fdb802d633be7246b49c2f639c130e63905cf41;hb=92fb12eb06716d14c05b781f5d9dcde956d77c30;hp=07bcdd07f0db51c351df8b88c3e15e7bf9aa4bce;hpb=4de79b34b329d1da6cdeb145993d3efd911e2967;p=pspp

diff --git a/src/t-test.q b/src/t-test.q
index 07bcdd07f0..5fdb802d63 100644
--- a/src/t-test.q
+++ b/src/t-test.q
@@ -26,23 +26,24 @@
 #include <stdlib.h>
 #include <math.h>
 #include "alloc.h"
-#include "str.h"
 #include "case.h"
+#include "casefile.h"
 #include "command.h"
 #include "dictionary.h"
-#include "lexer.h"
 #include "error.h"
+#include "group_proc.h"
+#include "hash.h"
+#include "levene.h"
+#include "lexer.h"
 #include "magic.h"
 #include "misc.h"
-#include "tab.h"
+#include "size_max.h"
 #include "som.h"
+#include "str.h"
+#include "tab.h"
 #include "value-labels.h"
 #include "var.h"
 #include "vfm.h"
-#include "hash.h"
-#include "group_proc.h"
-#include "casefile.h"
-#include "levene.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -67,7 +68,7 @@
 
 
 /* Function to use for testing for missing values */
-static is_missing_func value_is_missing;
+static is_missing_func *value_is_missing;
 
 /* Variable for the GROUPS subcommand, if given. */
 static struct variable *indep_var;
@@ -309,8 +310,8 @@ cmd_t_test(void)
 	  assert(cmd.n_variables == 0);
 	  cmd.n_variables = hsh_count(hash);
 
-	  cmd.v_variables = xrealloc(cmd.v_variables,
-				     sizeof(struct variable) * cmd.n_variables);
+	  cmd.v_variables = xnrealloc (cmd.v_variables, cmd.n_variables,
+                                       sizeof *cmd.v_variables);
 	  /* Iterate through the hash */
 	  for (i=0,v = (struct variable *) hsh_first(hash,&hi);
 	       v != 0;
@@ -330,9 +331,9 @@ cmd_t_test(void)
 
   /* If /MISSING=INCLUDE is set, then user missing values are ignored */
   if (cmd.incl == TTS_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;
 
   bad_weight_warn = 1;
 
@@ -440,11 +441,11 @@ static int
 tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
 {
   struct variable **vars;
-  int n_vars;
-  int n_pairs_local;
+  size_t n_vars;
+  size_t n_pairs_local;
 
-  int n_before_WITH ;
-  int n_after_WITH = -1;
+  size_t n_before_WITH;
+  size_t n_after_WITH = SIZE_MAX;
   int paired ; /* Was the PAIRED keyword given ? */
 
   lex_match('=');
@@ -458,7 +459,7 @@ tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
     }
   assert (n_vars);
 
-  n_before_WITH=0;
+  n_before_WITH = 0;
   if (lex_match (T_WITH))
     {
       n_before_WITH = n_vars;
@@ -486,11 +487,11 @@ tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
 	       n_before_WITH, n_after_WITH );
 	  return 0;
 	}
-      n_pairs_local=n_before_WITH;
+      n_pairs_local = n_before_WITH;
     }
   else if (n_before_WITH > 0) /* WITH keyword given, but not PAIRED keyword */
     {
-      n_pairs_local=n_before_WITH * n_after_WITH ;
+      n_pairs_local = n_before_WITH * n_after_WITH ;
     }
   else /* Neither WITH nor PAIRED keyword given */
     {
@@ -503,29 +504,29 @@ tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
 	}
 
       /* how many ways can you pick 2 from n_vars ? */
-      n_pairs_local = n_vars * (n_vars -1 ) /2 ;
+      n_pairs_local = n_vars * (n_vars - 1) / 2;
     }
 
 
   /* Allocate storage for the pairs */
-  pairs = xrealloc(pairs, sizeof(struct pair) * (n_pairs + n_pairs_local) );
+  pairs = xnrealloc (pairs, n_pairs + n_pairs_local, sizeof *pairs);
 
   /* Populate the pairs with the appropriate variables */
   if ( paired ) 
     {
       int i;
 
-      assert(n_pairs_local == n_vars/2);
-      for (i = 0; i < n_pairs_local ; ++i)
+      assert(n_pairs_local == n_vars / 2);
+      for (i = 0; i < n_pairs_local; ++i)
 	{
-	  pairs[i].v[n_pairs+0] = vars[i];
-	  pairs[i].v[n_pairs+1] = vars[i+n_pairs_local];
+	  pairs[i].v[n_pairs] = vars[i];
+	  pairs[i].v[n_pairs + 1] = vars[i + n_pairs_local];
 	}
     }
   else if (n_before_WITH > 0) /* WITH keyword given, but not PAIRED keyword */
     {
       int i,j;
-      int p=n_pairs;
+      size_t p = n_pairs;
 
       for(i=0 ; i < n_before_WITH ; ++i ) 
 	{
@@ -539,8 +540,8 @@ tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
     }
   else /* Neither WITH nor PAIRED given */
     {
-      int i,j;
-      int p=n_pairs;
+      size_t i,j;
+      size_t p=n_pairs;
       
       for(i=0 ; i < n_vars ; ++i ) 
 	{
@@ -889,7 +890,7 @@ ssbox_one_sample_populate(struct ssbox *ssb, struct cmd_t_test *cmd)
 
 /* Implementation of the Test Results box struct */
 
-void trbox_base_init(struct trbox *self,int n_vars, int cols);
+void trbox_base_init(struct trbox *self,size_t n_vars, int cols);
 void trbox_base_finalize(struct trbox *trb);
 
 void trbox_independent_samples_init(struct trbox *trb,
@@ -1317,9 +1318,9 @@ trbox_one_sample_populate(struct trbox *trb, struct cmd_t_test *cmd)
 
 /* Base initializer for the generalized trbox */
 void 
-trbox_base_init(struct trbox *self, int data_rows, int cols)
+trbox_base_init(struct trbox *self, size_t data_rows, int cols)
 {
-  const int rows = 3 + data_rows;
+  const size_t rows = 3 + data_rows;
 
   self->finalize = trbox_base_finalize;
   self->t = tab_create (cols, rows, 0);
@@ -1418,7 +1419,7 @@ common_calc (const struct ccase *c, void *_cmd)
 	  struct variable *v = cmd->v_variables[i];
 	  const union value *val = case_data (c, v->fv);
 
-	  if (value_is_missing(val,v) )
+	  if (value_is_missing(&v->miss, val) )
 	    {
 	      return 0;
 	    }
@@ -1429,7 +1430,7 @@ common_calc (const struct ccase *c, void *_cmd)
   if ( cmd->sbc_groups )
     {
       const union value *gv = case_data (c, indep_var->fv);
-      if ( value_is_missing(gv,indep_var) )
+      if ( value_is_missing(&indep_var->miss, gv) )
 	{
 	  return 0;
 	}
@@ -1444,7 +1445,7 @@ common_calc (const struct ccase *c, void *_cmd)
 
       gs= &group_proc_get (cmd->v_variables[i])->ugs;
 
-      if (! value_is_missing(val,v) )
+      if (! value_is_missing(&v->miss, val) )
 	{
 	  gs->n+=weight;
 	  gs->sum+=weight * val->f;
@@ -1517,7 +1518,7 @@ one_sample_calc (const struct ccase *c, void *cmd_)
 	  struct variable *v = cmd->v_variables[i];
 	  const union value *val = case_data (c, v->fv);
 
-	  if (value_is_missing(val,v) )
+	  if (value_is_missing(&v->miss, val) )
 	    {
 	      return 0;
 	    }
@@ -1532,7 +1533,7 @@ one_sample_calc (const struct ccase *c, void *cmd_)
 
       gs= &group_proc_get (cmd->v_variables[i])->ugs;
       
-      if ( ! value_is_missing(val,v))
+      if ( ! value_is_missing(&v->miss, val))
 	gs->sum_diff += weight * (val->f - cmd->n_testval[0]);
     }
 
@@ -1611,8 +1612,8 @@ paired_calc (const struct ccase *c, void *cmd_)
 	  const union value *val0 = case_data (c, v0->fv);
 	  const union value *val1 = case_data (c, v1->fv);
 	  
-	  if ( value_is_missing(val0,v0) ||
-	       value_is_missing(val1,v1) )
+	  if ( value_is_missing(&v0->miss, val0) ||
+	       value_is_missing(&v1->miss, val1) )
 	    {
 	      return 0;
 	    }
@@ -1627,7 +1628,8 @@ paired_calc (const struct ccase *c, void *cmd_)
       const union value *val0 = case_data (c, v0->fv);
       const union value *val1 = case_data (c, v1->fv);
 
-      if ( ( !value_is_missing(val0,v0) && !value_is_missing(val1,v1) ) )
+      if ( ( !value_is_missing(&v0->miss, val0)
+             && !value_is_missing(&v1->miss, val1) ) )
       {
 	pairs[i].n += weight;
 	pairs[i].sum[0] += weight * val0->f;
@@ -1709,8 +1711,7 @@ group_precalc (struct cmd_t_test *cmd )
       for (j=0 ; j < 2 ; ++j)
 	{
 
-	  struct group_statistics *gs = (struct group_statistics *) 
-	    xmalloc (sizeof(struct group_statistics));
+	  struct group_statistics *gs = xmalloc (sizeof *gs);
 
 	  gs->sum = 0;
 	  gs->n = 0;
@@ -1744,7 +1745,7 @@ group_calc (const struct ccase *c, struct cmd_t_test *cmd)
 
   const double weight = dict_get_case_weight(default_dict,c,&bad_weight_warn);
 
-  if ( value_is_missing(gv,indep_var) )
+  if ( value_is_missing(&indep_var->miss, gv) )
     {
       return 0;
     }
@@ -1756,7 +1757,7 @@ group_calc (const struct ccase *c, struct cmd_t_test *cmd)
 	  struct variable *v = cmd->v_variables[i];
 	  const union value *val = case_data (c, v->fv);
 
-	  if (value_is_missing(val,v) )
+	  if (value_is_missing(&v->miss, val) )
 	    {
 	      return 0;
 	    }
@@ -1779,7 +1780,7 @@ group_calc (const struct ccase *c, struct cmd_t_test *cmd)
       if ( ! gs ) 
       	return 0;
 
-      if ( !value_is_missing(val,var) )
+      if ( !value_is_missing(&var->miss, val) )
 	{
 	  gs->n+=weight;
 	  gs->sum+=weight * val->f;