Fewer uses of size_t in list.c

* src/list.c (recent_long_name_blocks, recent_long_link_blocks)
(read_header, from_header, gid_from_header, major_from_header)
(minor_from_header, mode_from_header, off_from_header)
(time_from_header, uid_from_header, uintmax_from_header)
(tartime): Prefer idx_t to size_t.

diff --git a/src/common.h b/src/common.h
index 51e55eb92e4ebfd59b5ed72204762a6395a987a2..5e0bf4cbba1622536f5ee82736df8b6836eb5f69 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -598,8 +598,8 @@ extern union block *current_header;
 extern enum archive_format current_format;
 extern union block *recent_long_name;
 extern union block *recent_long_link;
-extern size_t recent_long_name_blocks;
-extern size_t recent_long_link_blocks;
+extern idx_t recent_long_name_blocks;
+extern idx_t recent_long_link_blocks;
 
 void decode_header (union block *header, struct tar_stat_info *stat_info,
                    enum archive_format *format_pointer, int do_user_group);
@@ -609,8 +609,8 @@ char const *tartime (struct timespec t, bool full_time);
 #define OFF_FROM_HEADER(where) off_from_header (where, sizeof (where))
 #define UINTMAX_FROM_HEADER(where) uintmax_from_header (where, sizeof (where))
 
-off_t off_from_header (const char *buf, size_t size);
-uintmax_t uintmax_from_header (const char *buf, size_t size);
+off_t off_from_header (const char *buf, idx_t size);
+uintmax_t uintmax_from_header (const char *buf, idx_t size);
 
 void list_archive (void);
 void test_archive_label (void);

diff --git a/src/list.c b/src/list.c
index 64a5fe43b1abea362ac86a977be5bab8d9725bfd..0cb561f553aae7398a95df1419d6df4361f54ea7 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -30,8 +30,8 @@ union block *current_header;  /* points to current archive header */
 enum archive_format current_format; /* recognized format */
 union block *recent_long_name; /* recent long name header and contents */
 union block *recent_long_link; /* likewise, for long link */
-size_t recent_long_name_blocks;        /* number of blocks in recent_long_name */
-size_t recent_long_link_blocks;        /* likewise, for long link */
+idx_t recent_long_name_blocks; /* number of blocks in recent_long_name */
+idx_t recent_long_link_blocks; /* likewise, for long link */
 static union block *recent_global_header; /* Recent global header block */
 
 #define GID_FROM_HEADER(where) gid_from_header (where, sizeof (where))
@@ -42,13 +42,13 @@ static union block *recent_global_header; /* Recent global header block */
 #define TIME_FROM_HEADER(where) time_from_header (where, sizeof (where))
 #define UID_FROM_HEADER(where) uid_from_header (where, sizeof (where))
 
-static gid_t gid_from_header (const char *buf, size_t size);
-static major_t major_from_header (const char *buf, size_t size);
-static minor_t minor_from_header (const char *buf, size_t size);
-static mode_t mode_from_header (const char *buf, size_t size, bool *hbits);
-static time_t time_from_header (const char *buf, size_t size);
-static uid_t uid_from_header (const char *buf, size_t size);
-static intmax_t from_header (const char *, size_t, const char *,
+static gid_t gid_from_header (const char *buf, idx_t size);
+static major_t major_from_header (const char *buf, idx_t size);
+static minor_t minor_from_header (const char *buf, idx_t size);
+static mode_t mode_from_header (const char *buf, idx_t size, bool *hbits);
+static time_t time_from_header (const char *buf, idx_t size);
+static uid_t uid_from_header (const char *buf, idx_t size);
+static intmax_t from_header (const char *, idx_t, const char *,
                             intmax_t, uintmax_t, bool, bool);
 
 /* Table of base-64 digit values + 1, indexed by unsigned chars.
@@ -398,11 +398,11 @@ read_header (union block **return_block, struct tar_stat_info *info,
   union block *header;
   char *bp;
   union block *data_block;
-  size_t size, written;
+  idx_t size, written;
   union block *next_long_name = NULL;
   union block *next_long_link = NULL;
-  size_t next_long_name_blocks = 0;
-  size_t next_long_link_blocks = 0;
+  idx_t next_long_name_blocks = 0;
+  idx_t next_long_link_blocks = 0;
   enum read_header status = HEADER_SUCCESS;
 
   while (1)
@@ -722,7 +722,7 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
    numbers instead of the other GNU extensions.  Return -1 on error,
    diagnosing the error if TYPE is nonnull and if !SILENT.  */
 static intmax_t
-from_header (char const *where0, size_t digs, char const *type,
+from_header (char const *where0, idx_t digs, char const *type,
             intmax_t minval, uintmax_t maxval,
             bool octal_only, bool silent)
 {
@@ -930,7 +930,7 @@ from_header (char const *where0, size_t digs, char const *type,
 }
 
 static gid_t
-gid_from_header (const char *p, size_t s)
+gid_from_header (const char *p, idx_t s)
 {
   return from_header (p, s, "gid_t",
                      TYPE_MINIMUM (gid_t), TYPE_MAXIMUM (gid_t),
@@ -938,7 +938,7 @@ gid_from_header (const char *p, size_t s)
 }
 
 static major_t
-major_from_header (const char *p, size_t s)
+major_from_header (const char *p, idx_t s)
 {
   return from_header (p, s, "major_t",
                      TYPE_MINIMUM (major_t), TYPE_MAXIMUM (major_t),
@@ -946,7 +946,7 @@ major_from_header (const char *p, size_t s)
 }
 
 static minor_t
-minor_from_header (const char *p, size_t s)
+minor_from_header (const char *p, idx_t s)
 {
   return from_header (p, s, "minor_t",
                      TYPE_MINIMUM (minor_t), TYPE_MAXIMUM (minor_t),
@@ -956,7 +956,7 @@ minor_from_header (const char *p, size_t s)
 /* Convert P to the file mode, as understood by tar.
    Set *HBITS if there are any unrecognized bits.  */
 static mode_t
-mode_from_header (const char *p, size_t s, bool *hbits)
+mode_from_header (const char *p, idx_t s, bool *hbits)
 {
   intmax_t u = from_header (p, s, "mode_t",
                            INTMAX_MIN, UINTMAX_MAX,
@@ -978,7 +978,7 @@ mode_from_header (const char *p, size_t s, bool *hbits)
 }
 
 off_t
-off_from_header (const char *p, size_t s)
+off_from_header (const char *p, idx_t s)
 {
   /* Negative offsets are not allowed in tar files, so invoke
      from_header with minimum value 0, not TYPE_MINIMUM (off_t).  */
@@ -988,7 +988,7 @@ off_from_header (const char *p, size_t s)
 }
 
 static time_t
-time_from_header (const char *p, size_t s)
+time_from_header (const char *p, idx_t s)
 {
   return from_header (p, s, "time_t",
                      TYPE_MINIMUM (time_t), TYPE_MAXIMUM (time_t),
@@ -996,7 +996,7 @@ time_from_header (const char *p, size_t s)
 }
 
 static uid_t
-uid_from_header (const char *p, size_t s)
+uid_from_header (const char *p, idx_t s)
 {
   return from_header (p, s, "uid_t",
                      TYPE_MINIMUM (uid_t), TYPE_MAXIMUM (uid_t),
@@ -1004,7 +1004,7 @@ uid_from_header (const char *p, size_t s)
 }
 
 uintmax_t
-uintmax_from_header (const char *p, size_t s)
+uintmax_from_header (const char *p, idx_t s)
 {
   return from_header (p, s, "uintmax_t", 0, UINTMAX_MAX, false, false);
 }
@@ -1039,7 +1039,7 @@ tartime (struct timespec t, bool full_time)
     {
       if (full_time)
        {
-         size_t n = strftime (buffer, sizeof buffer, "%Y-%m-%d %H:%M:%S", tm);
+         idx_t n = strftime (buffer, sizeof buffer, "%Y-%m-%d %H:%M:%S", tm);
          code_ns_fraction (ns, buffer + n);
        }
       else