From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 17 Feb 2014 23:28:29 +0000 (-0800)
Subject: sys-file-reader: Fix confusion of types between size_t and unsigned int.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f893adf05c12df3d1e94ab5f55a65f9f47cc5ae;p=pspp

sys-file-reader: Fix confusion of types between size_t and unsigned int.

Reported by Clang.
---

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index a93f75fa77..ef8950be62 100644
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -160,8 +160,8 @@ struct sfm_extension_record
   {
     int subtype;                /* Record subtype. */
     off_t pos;                  /* Starting offset in file. */
-    size_t size;                /* Size of data elements. */
-    size_t count;               /* Number of data elements. */
+    unsigned int size;          /* Size of data elements. */
+    unsigned int count;         /* Number of data elements. */
     void *data;                 /* Contents. */
   };
 
@@ -1141,7 +1141,7 @@ read_value_label_record (struct sfm_reader *r,
   record->pos = r->pos;
   if (!read_uint (r, &record->n_labels))
     return false;
-  if (record->n_labels > SIZE_MAX / sizeof *record->labels)
+  if (record->n_labels > UINT_MAX / sizeof *record->labels)
     {
       sys_error (r, r->pos - 4, _("Invalid number of labels %zu."),
                  record->n_labels);