X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fshort-names.c;h=ff6b4ff7739d0793a6f2b4c8bbb314b21281a7d7;hb=bcaaaebdde43e26a8d27c53590f34bf29eb56406;hp=aa157bae1b13c105f4685fb120e7c92980f13938;hpb=97fed7964411b7bed4d8ad5bc895966de7e6b2b3;p=pspp

diff --git a/src/data/short-names.c b/src/data/short-names.c
index aa157bae1b..ff6b4ff773 100644
--- a/src/data/short-names.c
+++ b/src/data/short-names.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011, 2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ assign_short_name (struct variable *v, size_t i,
       else
         {
           suffix[0] = '_';
-          str_format_26adic (trial, &suffix[1], sizeof suffix - 1);
+          str_format_26adic (trial, true, &suffix[1], sizeof suffix - 1);
         }
 
       /* Set name. */
@@ -89,18 +89,17 @@ assign_short_name (struct variable *v, size_t i,
 void
 short_names_assign (struct dictionary *d)
 {
-  size_t var_cnt = dict_get_var_cnt (d);
+  size_t n_vars = dict_get_n_vars (d);
   struct stringi_set short_names;
-  size_t i, j;
 
   stringi_set_init (&short_names);
 
   /* Clear short names that conflict with a variable name. */
-  for (i = 0; i < var_cnt; i++)
+  for (size_t i = 0; i < n_vars; i++)
     {
       struct variable *v = dict_get_var (d, i);
-      int segment_cnt = sfm_width_to_segments (var_get_width (v));
-      for (j = 0; j < segment_cnt; j++)
+      int n_segments = sfm_width_to_segments (var_get_width (v));
+      for (size_t j = 0; j < n_segments; j++)
         {
           const char *name = var_get_short_name (v, j);
           if (name != NULL)
@@ -114,7 +113,7 @@ short_names_assign (struct dictionary *d)
 
   /* Give variables whose names are short the corresponding short
      name. */
-  for (i = 0; i < var_cnt; i++)
+  for (size_t i = 0; i < n_vars; i++)
     {
       struct variable *v = dict_get_var (d, i);
       const char *name = var_get_name (v);
@@ -128,31 +127,31 @@ short_names_assign (struct dictionary *d)
      conflict, the claimant earlier in dictionary order wins.
      Then similarly for additional segments of very long
      strings. */
-  for (i = 0; i < var_cnt; i++)
+  for (size_t i = 0; i < n_vars; i++)
     {
       struct variable *v = dict_get_var (d, i);
       claim_short_name (v, 0, &short_names);
     }
-  for (i = 0; i < var_cnt; i++)
+  for (size_t i = 0; i < n_vars; i++)
     {
       struct variable *v = dict_get_var (d, i);
-      int segment_cnt = sfm_width_to_segments (var_get_width (v));
-      for (j = 1; j < segment_cnt; j++)
+      int n_segments = sfm_width_to_segments (var_get_width (v));
+      for (size_t j = 1; j < n_segments; j++)
         claim_short_name (v, j, &short_names);
     }
 
   /* Assign short names to first segment of remaining variables,
      then similarly for additional segments. */
-  for (i = 0; i < var_cnt; i++)
+  for (size_t i = 0; i < n_vars; i++)
     {
       struct variable *v = dict_get_var (d, i);
       assign_short_name (v, 0, &short_names);
     }
-  for (i = 0; i < var_cnt; i++)
+  for (size_t i = 0; i < n_vars; i++)
     {
       struct variable *v = dict_get_var (d, i);
-      int segment_cnt = sfm_width_to_segments (var_get_width (v));
-      for (j = 1; j < segment_cnt; j++)
+      int n_segments = sfm_width_to_segments (var_get_width (v));
+      for (size_t j = 1; j < n_segments; j++)
         assign_short_name (v, j, &short_names);
     }