mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fewer uses of size_t in list.c

Browse Source 
* 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.
This commit is contained in:
Paul Eggert
2024-10-31 19:53:25 -07:00
parent f73c927a71
commit dd71d3796d
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common.h
View File

@@ -598,8 +598,8 @@ extern union block *current_header;
extern enum archive_format current_format; extern enum archive_format current_format;
extern union block *recent_long_name; extern union block *recent_long_name;
extern union block *recent_long_link; extern union block *recent_long_link;
extern size_t recent_long_name_blocks; extern idx_t recent_long_name_blocks;
extern size_t recent_long_link_blocks; extern idx_t recent_long_link_blocks;
void decode_header (union block *header, struct tar_stat_info *stat_info, void decode_header (union block *header, struct tar_stat_info *stat_info,
enum archive_format *format_pointer, int do_user_group); 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 OFF_FROM_HEADER(where) off_from_header (where, sizeof (where))
#define UINTMAX_FROM_HEADER(where) uintmax_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); off_t off_from_header (const char *buf, idx_t size);
uintmax_t uintmax_from_header (const char *buf, size_t size); uintmax_t uintmax_from_header (const char *buf, idx_t size);
void list_archive (void); void list_archive (void);
void test_archive_label (void); void test_archive_label (void);

44
src/list.c
View File

@@ -30,8 +30,8 @@ union block *current_header; /* points to current archive header */
enum archive_format current_format; /* recognized format */ enum archive_format current_format; /* recognized format */
union block *recent_long_name; /* recent long name header and contents */ union block *recent_long_name; /* recent long name header and contents */
union block *recent_long_link; /* likewise, for long link */ union block *recent_long_link; /* likewise, for long link */
size_t recent_long_name_blocks; /* number of blocks in recent_long_name */ idx_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_link_blocks; /* likewise, for long link */
static union block *recent_global_header; /* Recent global header block */ static union block *recent_global_header; /* Recent global header block */
#define GID_FROM_HEADER(where) gid_from_header (where, sizeof (where)) #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 TIME_FROM_HEADER(where) time_from_header (where, sizeof (where))
#define UID_FROM_HEADER(where) uid_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 gid_t gid_from_header (const char *buf, idx_t size);
static major_t major_from_header (const char *buf, size_t size); static major_t major_from_header (const char *buf, idx_t size);
static minor_t minor_from_header (const char *buf, size_t size); static minor_t minor_from_header (const char *buf, idx_t size);
static mode_t mode_from_header (const char *buf, size_t size, bool *hbits); static mode_t mode_from_header (const char *buf, idx_t size, bool *hbits);
static time_t time_from_header (const char *buf, size_t size); static time_t time_from_header (const char *buf, idx_t size);
static uid_t uid_from_header (const char *buf, size_t size); static uid_t uid_from_header (const char *buf, idx_t size);
static intmax_t from_header (const char *, size_t, const char *, static intmax_t from_header (const char *, idx_t, const char *,
intmax_t, uintmax_t, bool, bool); intmax_t, uintmax_t, bool, bool);
/* Table of base-64 digit values + 1, indexed by unsigned chars. /* 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; union block *header;
char *bp; char *bp;
union block *data_block; union block *data_block;
size_t size, written; idx_t size, written;
union block *next_long_name = NULL; union block *next_long_name = NULL;
union block *next_long_link = NULL; union block *next_long_link = NULL;
size_t next_long_name_blocks = 0; idx_t next_long_name_blocks = 0;
size_t next_long_link_blocks = 0; idx_t next_long_link_blocks = 0;
enum read_header status = HEADER_SUCCESS; enum read_header status = HEADER_SUCCESS;
while (1) 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, numbers instead of the other GNU extensions. Return -1 on error,
diagnosing the error if TYPE is nonnull and if !SILENT. */ diagnosing the error if TYPE is nonnull and if !SILENT. */
static intmax_t 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, intmax_t minval, uintmax_t maxval,
bool octal_only, bool silent) bool octal_only, bool silent)
{ {
@@ -930,7 +930,7 @@ from_header (char const *where0, size_t digs, char const *type,
} }
static gid_t 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", return from_header (p, s, "gid_t",
TYPE_MINIMUM (gid_t), TYPE_MAXIMUM (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 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", return from_header (p, s, "major_t",
TYPE_MINIMUM (major_t), TYPE_MAXIMUM (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 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", return from_header (p, s, "minor_t",
TYPE_MINIMUM (minor_t), TYPE_MAXIMUM (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. /* Convert P to the file mode, as understood by tar.
Set *HBITS if there are any unrecognized bits. */ Set *HBITS if there are any unrecognized bits. */
static mode_t 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_t u = from_header (p, s, "mode_t",
INTMAX_MIN, UINTMAX_MAX, INTMAX_MIN, UINTMAX_MAX,
@@ -978,7 +978,7 @@ mode_from_header (const char *p, size_t s, bool *hbits)
} }
off_t 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 /* Negative offsets are not allowed in tar files, so invoke
from_header with minimum value 0, not TYPE_MINIMUM (off_t). */ 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 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", return from_header (p, s, "time_t",
TYPE_MINIMUM (time_t), TYPE_MAXIMUM (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 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", return from_header (p, s, "uid_t",
TYPE_MINIMUM (uid_t), TYPE_MAXIMUM (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_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); 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) 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); code_ns_fraction (ns, buffer + n);
} }
else else