[Pspp-cvs] pspp/src data/por-file-reader.c data/sys-file-r...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/02/09 05:19:09

Modified files:
        src/data       : por-file-reader.c sys-file-reader.c 
        src/language/data-io: file-handle.q placement-parser.c print.c 
        src/language/dictionary: modify-variables.c rename-variables.c 
                                 sys-file-info.c 
        src/language/lexer: lexer.c 
        src/language/stats: aggregate.c descriptives.c npar.q oneway.q 
                            regression.q t-test.q 
        src/language/tests: moments-test.c 
        src/math       : sort.c 
        src/output     : html.c 

Log message:
        Fix use of size_t in printf formats.  Patch #5727.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-reader.c?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-reader.c?cvsroot=pspp&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/file-handle.q?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/placement-parser.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/print.c?cvsroot=pspp&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/modify-variables.c?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/rename-variables.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/sys-file-info.c?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/lexer.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/aggregate.c?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/descriptives.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/npar.q?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/oneway.q?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/regression.q?cvsroot=pspp&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/t-test.q?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/tests/moments-test.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/sort.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/html.c?cvsroot=pspp&r1=1.16&r2=1.17

Patches:
Index: data/por-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/por-file-reader.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- data/por-file-reader.c      15 Dec 2006 00:16:02 -0000      1.15
+++ data/por-file-reader.c      9 Feb 2007 05:19:08 -0000       1.16
@@ -430,9 +430,9 @@
 
   /* Validate file. */
   if (strlen (date) != 8)
-    error (r, _("Bad date string length %d."), strlen (date));
+    error (r, _("Bad date string length %d."), (int) strlen (date));
   if (strlen (time) != 6)
-    error (r, _("Bad time string length %d."), strlen (time));
+    error (r, _("Bad time string length %d."), (int) strlen (time));
 
   /* Save file info. */
   if (info != NULL) 

Index: data/sys-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-reader.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- data/sys-file-reader.c      16 Dec 2006 22:11:08 -0000      1.31
+++ data/sys-file-reader.c      9 Feb 2007 05:19:08 -0000       1.32
@@ -472,8 +472,8 @@
 
       len = read_int32 (r);
       if (len >= sizeof label)
-        sys_error (r, _("Variable %s has label of invalid length %d."),
-                   name, len);
+        sys_error (r, _("Variable %s has label of invalid length %u."),
+                   name, (unsigned int) len);
       read_string (r, label, len + 1);
       var_set_label (var, label);
       
@@ -736,9 +736,9 @@
   int expected_integer_format;
 
   if (size != 4 || count != 8)
-    sys_error (r, _("Bad size (%d) or count (%d) field on record type 7, "
+    sys_error (r, _("Bad size (%u) or count (%u) field on record type 7, "
                     "subtype 3."),
-               size, count);
+               (unsigned int) size, (unsigned int) count);
 
   /* Check floating point format. */
   if (r->float_format == FLOAT_IEEE_DOUBLE_BE
@@ -781,8 +781,8 @@
   double lowest = read_flt64 (r);
 
   if (size != 8 || count != 3)
-    sys_error (r, _("Bad size (%d) or count (%d) on extension 4."),
-               size, count);
+    sys_error (r, _("Bad size (%u) or count (%u) on extension 4."),
+               (unsigned int) size, (unsigned int) count);
 
   if (sysmis != SYSMIS)
     sys_warn (r, _("File specifies unexpected value %g as SYSMIS."), sysmis);
@@ -803,8 +803,8 @@
   int i;
 
   if (count % 3 || n_vars != dict_get_var_cnt (dict)) 
-    sys_error (r, _("Bad size (%d) or count (%d) on extension 11."),
-               size, count);
+    sys_error (r, _("Bad size (%u) or count (%u) on extension 11."),
+               (unsigned int) size, (unsigned int) count);
 
   for (i = 0; i < n_vars; ++i) 
     {
@@ -1003,8 +1003,8 @@
   var_cnt = read_int32 (r);
   if (var_cnt < 1 || var_cnt > dict_get_var_cnt (dict))
     sys_error (r, _("Number of variables associated with a value label (%d) "
-                    "is not between 1 and the number of variables (%d)."),
-               var_cnt, dict_get_var_cnt (dict));
+                    "is not between 1 and the number of variables (%u)."),
+               var_cnt, (unsigned int) dict_get_var_cnt (dict));
 
   /* Read the list of variables. */
   var = pool_nalloc (subpool, var_cnt, sizeof *var);

Index: language/data-io/file-handle.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/file-handle.q,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- language/data-io/file-handle.q      2 Feb 2007 00:57:32 -0000       1.12
+++ language/data-io/file-handle.q      9 Feb 2007 05:19:08 -0000       1.13
@@ -98,12 +98,12 @@
       if (cmd.n_lrecl[0] == NOT_LONG)
         msg (SE, _("Fixed-length records were specified on /RECFORM, but "
                    "record length was not specified on /LRECL.  "
-                   "Assuming %d-character records."),
-             properties.record_width);
+                   "Assuming %u-character records."),
+             (unsigned int) properties.record_width);
       else if (cmd.n_lrecl[0] < 1)
         msg (SE, _("Record length (%ld) must be at least one byte.  "
-                   "Assuming %d-character records."),
-             cmd.n_lrecl[0], properties.record_width);
+                   "Assuming %u-character records."),
+             cmd.n_lrecl[0], (unsigned int) properties.record_width);
       else
         properties.record_width = cmd.n_lrecl[0];
       break;

Index: language/data-io/placement-parser.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/placement-parser.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- language/data-io/placement-parser.c 15 Dec 2006 00:16:02 -0000      1.4
+++ language/data-io/placement-parser.c 9 Feb 2007 05:19:08 -0000       1.5
@@ -117,8 +117,8 @@
   if ((lc - fc + 1) % var_cnt)
     {
       msg (SE, _("The %d columns %d-%d "
-                "can't be evenly divided into %d fields."),
-          lc - fc + 1, fc, lc, var_cnt);
+                "can't be evenly divided into %u fields."),
+          lc - fc + 1, fc, lc, (unsigned int) var_cnt);
       return false;
     }
 

Index: language/data-io/print.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/print.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- language/data-io/print.c    15 Dec 2006 00:16:02 -0000      1.23
+++ language/data-io/print.c    9 Feb 2007 05:19:08 -0000       1.24
@@ -257,9 +257,9 @@
     }
 
   if (trns->record_cnt != 0 && trns->record_cnt != record)
-    msg (SW, _("Output calls for %d records but %d specified on RECORDS "
+    msg (SW, _("Output calls for %d records but %u specified on RECORDS "
                "subcommand."),
-         record, trns->record_cnt);
+         record, (unsigned int) trns->record_cnt);
   trns->record_cnt = record;
 
   return true;

Index: language/dictionary/modify-variables.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/modify-variables.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- language/dictionary/modify-variables.c      15 Dec 2006 00:16:02 -0000      
1.15
+++ language/dictionary/modify-variables.c      9 Feb 2007 05:19:08 -0000       
1.16
@@ -210,7 +210,8 @@
                {
                  msg (SE, _("Differing number of variables in old name list "
                       "(%d) and in new name list (%d)."),
-                      vm.rename_cnt - prev_nv_2, prev_nv_1 - prev_nv_2);
+                      (int) (vm.rename_cnt - prev_nv_2),
+                       (int) (prev_nv_1 - prev_nv_2));
                  for (i = 0; i < prev_nv_1; i++)
                    free (vm.new_names[i]);
                  free (vm.new_names);

Index: language/dictionary/rename-variables.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/rename-variables.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- language/dictionary/rename-variables.c      15 Dec 2006 00:16:02 -0000      
1.9
+++ language/dictionary/rename-variables.c      9 Feb 2007 05:19:08 -0000       
1.10
@@ -75,9 +75,9 @@
           size_t i;
 
          msg (SE, _("Differing number of variables in old name list "
-                     "(%u) and in new name list (%u)."),
-              (unsigned) rename_cnt - prev_nv_2,
-               (unsigned) prev_nv_1 - prev_nv_2);
+                     "(%d) and in new name list (%d)."),
+              (int) (rename_cnt - prev_nv_2),
+               (int) (prev_nv_1 - prev_nv_2));
          for (i = 0; i < prev_nv_1; i++)
            free (rename_new_names[i]);
          free (rename_new_names);

Index: language/dictionary/sys-file-info.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/sys-file-info.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- language/dictionary/sys-file-info.c 15 Dec 2006 00:16:02 -0000      1.20
+++ language/dictionary/sys-file-info.c 9 Feb 2007 05:19:08 -0000       1.21
@@ -132,8 +132,8 @@
             : info.float_format == FLOAT_Z_LONG ? _("IBM 390 Hex Long.")
             : _("Unknown."));
   tab_text (t, 0, 5, TAB_LEFT, _("Variables:"));
-  tab_text (t, 1, 5, TAB_LEFT | TAT_PRINTF, "%d",
-               dict_get_var_cnt (d));
+  tab_text (t, 1, 5, TAB_LEFT | TAT_PRINTF, "%u",
+            (unsigned int) dict_get_var_cnt (d));
   tab_text (t, 0, 6, TAB_LEFT, _("Cases:"));
   tab_text (t, 1, 6, TAB_LEFT | TAT_PRINTF,
                info.case_cnt == -1 ? _("Unknown") : "%d", info.case_cnt);

Index: language/lexer/lexer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/lexer.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- language/lexer/lexer.c      15 Dec 2006 00:16:02 -0000      1.18
+++ language/lexer/lexer.c      9 Feb 2007 05:19:08 -0000       1.19
@@ -1047,7 +1047,7 @@
   if (ds_length (&lexer->tokstr) % chars_per_byte)
     msg (SE, _("String of %s digits has %d characters, which is not a "
               "multiple of %d."),
-        base_name, ds_length (&lexer->tokstr), chars_per_byte);
+        base_name, (int) ds_length (&lexer->tokstr), chars_per_byte);
 
   p = ds_cstr (&lexer->tokstr);
   for (i = 0; i < byte_cnt; i++)
@@ -1184,7 +1184,7 @@
   if (ds_length (&lexer->tokstr) > 255)
     {
       msg (SE, _("String exceeds 255 characters in length (%d characters)."),
-          ds_length (&lexer->tokstr));
+          (int) ds_length (&lexer->tokstr));
       ds_truncate (&lexer->tokstr, 255);
     }
       

Index: language/stats/aggregate.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/aggregate.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- language/stats/aggregate.c  10 Jan 2007 03:18:02 -0000      1.29
+++ language/stats/aggregate.c  9 Feb 2007 05:19:08 -0000       1.30
@@ -520,8 +520,8 @@
                  }
                 else
                   {
-                   msg (SE, _("Missing argument %d to %s."), i + 1,
-                         function->name);
+                   msg (SE, _("Missing argument %d to %s."),
+                         (int) i + 1, function->name);
                    goto error;
                  }
            

Index: language/stats/descriptives.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/descriptives.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- language/stats/descriptives.c       23 Dec 2006 06:11:33 -0000      1.21
+++ language/stats/descriptives.c       9 Feb 2007 05:19:08 -0000       1.22
@@ -175,7 +175,7 @@
                      struct dsc_proc *dsc, const char *name);
 static bool generate_z_varname (const struct dictionary *dict, 
                                struct dsc_proc *dsc, char *z_name,
-                               const char *name, size_t *z_cnt);
+                               const char *name, int *z_cnt);
 static void dump_z_table (struct dsc_proc *);
 static void setup_z_trns (struct dsc_proc *, struct dataset *);
 
@@ -196,7 +196,7 @@
   struct variable **vars = NULL;
   size_t var_cnt = 0;
   int save_z_scores = 0;
-  size_t z_cnt = 0;
+  int z_cnt = 0;
   size_t i;
   bool ok;
 
@@ -370,7 +370,7 @@
     {
       if (save_z_scores) 
         {
-          size_t gen_cnt = 0;
+          int gen_cnt = 0;
 
           for (i = 0; i < dsc->var_cnt; i++)
             if (dsc->vars[i].z_name[0] == 0) 
@@ -491,7 +491,7 @@
    copies the new name into Z_NAME.  On failure, returns false. */
 static bool
 generate_z_varname (const struct dictionary *dict, struct dsc_proc *dsc, char 
*z_name,
-                    const char *var_name, size_t *z_cnt)
+                    const char *var_name, int *z_cnt)
 {
   char name[LONG_NAME_LEN + 1];
 

Index: language/stats/npar.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/npar.q,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- language/stats/npar.q       23 Dec 2006 06:11:33 -0000      1.2
+++ language/stats/npar.q       9 Feb 2007 05:19:08 -0000       1.3
@@ -421,7 +421,7 @@
          if ( n_vlist1 != n_vlist2) 
            msg (SE, _("PAIRED was specified but the number of variables "
                       "preceding WITH (%d) did not match the number "
-                      "following (%d)."), n_vlist1, n_vlist2);
+                      "following (%d)."), (int) n_vlist1, (int) n_vlist2);
 
          test_parameters->n_pairs = n_vlist1 ;
        }

Index: language/stats/oneway.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/oneway.q,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- language/stats/oneway.q     16 Jan 2007 15:30:28 -0000      1.20
+++ language/stats/oneway.q     9 Feb 2007 05:19:08 -0000       1.21
@@ -175,7 +175,8 @@
        sum += subc_list_double_at(&cmd.dl_contrast[i],j);
 
       if ( sum != 0.0 ) 
-       msg(SW,_("Coefficients for contrast %d do not total zero"),i + 1);
+       msg(SW,_("Coefficients for contrast %d do not total zero"),
+            (int) i + 1);
     }
 
   if ( stat_tables & STAT_DESC ) 

Index: language/stats/regression.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/regression.q,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- language/stats/regression.q 4 Feb 2007 16:38:26 -0000       1.44
+++ language/stats/regression.q 9 Feb 2007 05:19:08 -0000       1.45
@@ -765,8 +765,8 @@
 
   for (i = 0; i < n_vars; i++)
     {
-      size_t n_categories = cat_get_n_categories (varlist[i]);
-      size_t j;
+      int n_categories = cat_get_n_categories (varlist[i]);
+      int j;
       
       fprintf (fp, "%s.name = \"%s\";\n\t",
                var_get_name (varlist[i]),

Index: language/stats/t-test.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/t-test.q,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- language/stats/t-test.q     23 Dec 2006 06:11:33 -0000      1.19
+++ language/stats/t-test.q     9 Feb 2007 05:19:08 -0000       1.20
@@ -485,7 +485,7 @@
          msg (SE, _("PAIRED was specified but the number of variables "
                     "preceding WITH (%d) did not match the number "
                     "following (%d)."),
-              n_before_WITH, n_after_WITH );
+              (int) n_before_WITH, (int) n_after_WITH );
          return 0;
        }
       n_pairs_local = n_before_WITH;

Index: language/tests/moments-test.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/tests/moments-test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- language/tests/moments-test.c       15 Dec 2006 00:16:03 -0000      1.8
+++ language/tests/moments-test.c       9 Feb 2007 05:19:09 -0000       1.9
@@ -125,7 +125,7 @@
   fprintf (stderr, "W=%.3f", weight);
   for (i = 0; i < 4; i++) 
     {
-      fprintf (stderr, " M%d=", i + 1);
+      fprintf (stderr, " M%d=", (int) i + 1);
       if (M[i] == SYSMIS)
         fprintf (stderr, "sysmis");
       else if (fabs (M[i]) <= 0.0005)

Index: math/sort.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/sort.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- math/sort.c 22 Dec 2006 11:12:15 -0000      1.22
+++ math/sort.c 9 Feb 2007 05:19:09 -0000       1.23
@@ -467,8 +467,9 @@
     {
       msg (SE, _("Out of memory.  Could not allocate room for minimum of %d "
                 "cases of %d bytes each.  (PSPP workspace is currently "
-                "restricted to a maximum of %d KB.)"),
-          min_buffers, approx_case_cost, get_workspace() / 1024);
+                "restricted to a maximum of %lu KB.)"),
+          min_buffers, approx_case_cost,
+           (unsigned long int) (get_workspace() / 1024));
       return 0;
     }
   return 1;

Index: output/html.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/html.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- output/html.c       15 Dec 2006 00:16:03 -0000      1.16
+++ output/html.c       9 Feb 2007 05:19:09 -0000       1.17
@@ -375,7 +375,7 @@
   number_pos = strchr (x->chart_file_name, '#') - x->chart_file_name;
   ch->file_name = xasprintf ("%.*s%d%s",
                              number_pos, x->chart_file_name,
-                             x->chart_cnt,
+                             (int) x->chart_cnt,
                              x->chart_file_name + number_pos + 1);
   fp = fopen (ch->file_name, "wb");
   if (fp == NULL)