X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fdescriptives.c;h=c1cbe6f27923c77593ccf14915d2bd20fa8a789f;hb=57e8789ebade6b927fbd85fd9a0738748e51daa4;hp=95c57740b2a25110c2d3ed3084b77634a692eda0;hpb=60c545e6e958d868db3399a8989d37d8f9e0c131;p=pspp

diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c
index 95c57740b2..c1cbe6f279 100644
--- a/src/language/stats/descriptives.c
+++ b/src/language/stats/descriptives.c
@@ -628,7 +628,7 @@ descriptives_trns_proc (void *trns_, struct ccase **c,
   if (t->filter)
     {
       double f = case_num (*c, t->filter);
-      if (f == 0.0 || var_is_num_missing (t->filter, f, MV_ANY))
+      if (f == 0.0 || var_is_num_missing (t->filter, f))
         {
           descriptives_set_all_sysmis_zscores (t, *c);
           return TRNS_CONTINUE;
@@ -673,7 +673,7 @@ descriptives_trns_proc (void *trns_, struct ccase **c,
       for (vars = t->vars; vars < t->vars + t->n_vars; vars++)
 	{
 	  double score = case_num (*c, *vars);
-	  if (var_is_num_missing (*vars, score, t->exclude))
+	  if (var_is_num_missing (*vars, score) & t->exclude)
 	    {
               descriptives_set_all_sysmis_zscores (t, *c);
 	      return TRNS_CONTINUE;
@@ -687,7 +687,7 @@ descriptives_trns_proc (void *trns_, struct ccase **c,
       double *output = case_num_rw (*c, z->z_var);
 
       if (z->mean == SYSMIS || z->std_dev == SYSMIS
-          || var_is_num_missing (z->src_var, input, t->exclude))
+          || var_is_num_missing (z->src_var, input) & t->exclude)
 	*output = SYSMIS;
       else
 	*output = (input - z->mean) / z->std_dev;
@@ -722,15 +722,15 @@ static void
 setup_z_trns (struct dsc_proc *dsc, struct dataset *ds)
 {
   struct dsc_trns *t;
-  size_t cnt, i;
+  size_t n, i;
 
-  for (cnt = i = 0; i < dsc->n_vars; i++)
+  for (n = i = 0; i < dsc->n_vars; i++)
     if (dsc->vars[i].z_name != NULL)
-      cnt++;
+      n++;
 
   t = xmalloc (sizeof *t);
-  t->z_scores = xnmalloc (cnt, sizeof *t->z_scores);
-  t->n_z_scores = cnt;
+  t->z_scores = xnmalloc (n, sizeof *t->z_scores);
+  t->n_z_scores = n;
   t->missing_type = dsc->missing_type;
   t->exclude = dsc->exclude;
   if (t->missing_type == DSC_LISTWISE)
@@ -751,7 +751,7 @@ setup_z_trns (struct dsc_proc *dsc, struct dataset *ds)
   t->ok = true;
   dsc->z_writer = NULL;
 
-  for (cnt = i = 0; i < dsc->n_vars; i++)
+  for (n = i = 0; i < dsc->n_vars; i++)
     {
       struct dsc_var *dv = &dsc->vars[i];
       if (dv->z_name != NULL)
@@ -766,7 +766,7 @@ setup_z_trns (struct dsc_proc *dsc, struct dataset *ds)
           var_set_label (dst_var, label);
           free (label);
 
-          z = &t->z_scores[cnt++];
+          z = &t->z_scores[n++];
           z->src_var = dv->v;
           z->z_var = dst_var;
 	}
@@ -829,7 +829,7 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group,
       if (filter)
         {
           double f = case_num (c, filter);
-          if (f == 0.0 || var_is_num_missing (filter, f, MV_ANY))
+          if (f == 0.0 || var_is_num_missing (filter, f))
             continue;
         }
 
@@ -847,7 +847,7 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group,
           struct dsc_var *dv = &dsc->vars[i];
           double x = case_num (c, dv->v);
 
-          if (var_is_num_missing (dv->v, x, dsc->exclude))
+          if (var_is_num_missing (dv->v, x) & dsc->exclude)
             {
               dv->missing += weight;
               continue;
@@ -880,7 +880,7 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group,
           if (filter)
             {
               double f = case_num (c, filter);
-              if (f == 0.0 || var_is_num_missing (filter, f, MV_ANY))
+              if (f == 0.0 || var_is_num_missing (filter, f))
                 continue;
             }
 
@@ -893,7 +893,7 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group,
               struct dsc_var *dv = &dsc->vars[i];
               double x = case_num (c, dv->v);
 
-              if (var_is_num_missing (dv->v, x, dsc->exclude))
+              if (var_is_num_missing (dv->v, x) & dsc->exclude)
                 continue;
 
               if (dv->moments != NULL)
@@ -974,7 +974,7 @@ listwise_missing (struct dsc_proc *dsc, const struct ccase *c)
       struct dsc_var *dv = &dsc->vars[i];
       double x = case_num (c, dv->v);
 
-      if (var_is_num_missing (dv->v, x, dsc->exclude))
+      if (var_is_num_missing (dv->v, x) & dsc->exclude)
         return true;
     }
   return false;