X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fdescriptives.c;h=160e45610f4057bd28a269d9c1b9a94eda47c073;hb=c59425770be98fa36071d0e55cbb5b47e910f5f4;hp=fdb454c2600af97bbffdb0a609d698d20885776c;hpb=f4491cda2715c59495d963d0a3d8ae4518c1c13d;p=pspp

diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c
index fdb454c260..160e45610f 100644
--- a/src/language/stats/descriptives.c
+++ b/src/language/stats/descriptives.c
@@ -474,8 +474,8 @@ match_statistic (struct lexer *lexer)
         if (lex_match_id (lexer, dsc_info[stat].identifier))
 	  return stat;
 
-      lex_get (lexer);
       lex_error (lexer, _("expecting statistic name: reverting to default"));
+      lex_get (lexer);
     }
 
   return DSC_NONE;
@@ -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;
 	}