From 2218fe155b82c004fd99961e741796037647a382 Mon Sep 17 00:00:00 2001 From: Rose <83477269+AtariDreams@users.noreply.github.com> Date: Thu, 20 Apr 2023 14:47:59 -0400 Subject: [PATCH] Fix a handful of compiler warnings This removes redundant includes, casts, and return statements. --- CMakeLists.txt | 2 +- contrib/archivetest.c | 1 - examples/minitar/minitar.c | 6 ++--- libarchive/archive_cmdline.c | 2 +- libarchive/archive_disk_acl_darwin.c | 19 ++++++++-------- libarchive/archive_disk_acl_freebsd.c | 15 +++++++------ libarchive/archive_disk_acl_linux.c | 22 ++++++++++--------- libarchive/archive_disk_acl_sunos.c | 16 +++++++------- libarchive/archive_entry_link_resolver.c | 1 - .../archive_read_disk_entry_from_file.c | 8 ++++--- libarchive/archive_read_open_fd.c | 2 +- libarchive/archive_read_open_file.c | 2 +- .../archive_read_support_filter_bzip2.c | 2 +- .../archive_read_support_filter_compress.c | 2 +- libarchive/archive_read_support_filter_gzip.c | 2 +- libarchive/archive_read_support_filter_lz4.c | 2 +- libarchive/archive_read_support_filter_lzop.c | 5 +---- libarchive/archive_read_support_filter_rpm.c | 2 +- libarchive/archive_read_support_filter_uu.c | 2 +- libarchive/archive_read_support_filter_xz.c | 2 +- libarchive/archive_read_support_filter_zstd.c | 6 +---- libarchive/archive_read_support_format_rar.c | 5 ++--- .../archive_write_add_filter_compress.c | 2 +- libarchive/archive_write_add_filter_zstd.c | 2 +- libarchive/archive_write_disk_posix.c | 22 +++++++++---------- libarchive/archive_write_set_format_gnutar.c | 2 +- libarchive/archive_write_set_format_pax.c | 3 +-- libarchive/archive_write_set_format_ustar.c | 2 +- libarchive/archive_write_set_format_v7tar.c | 2 +- libarchive_fe/passphrase.c | 1 - tar/bsdtar.c | 1 - test_utils/test_main.c | 7 +++--- 32 files changed, 81 insertions(+), 89 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 646484b79e..a828848430 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1087,7 +1087,7 @@ MACRO(CHECK_ICONV LIB TRY_ICONV_CONST) ENDIF(HAVE_ICONV_${LIB}_${TRY_ICONV_CONST}) CMAKE_POP_CHECK_STATE() # Restore the state of the variables ENDIF(NOT HAVE_ICONV) -ENDMACRO(CHECK_ICONV TRY_ICONV_CONST) +ENDMACRO() IF(ENABLE_ICONV) CMAKE_PUSH_CHECK_STATE() # Save the state of the variables diff --git a/contrib/archivetest.c b/contrib/archivetest.c index e4a25e3c91..28f73bc61f 100644 --- a/contrib/archivetest.c +++ b/contrib/archivetest.c @@ -201,7 +201,6 @@ int main(int argc, char *argv[]) v_print(v, "skipping"); } else { while ((r = archive_read_data(a, buffer, 4096) > 0)) - ; if (r == ARCHIVE_FATAL) { v_print(v, "ERROR\nError string: %s\n", archive_error_string(a)); diff --git a/examples/minitar/minitar.c b/examples/minitar/minitar.c index 881f94b2d3..4d4932b74b 100644 --- a/examples/minitar/minitar.c +++ b/examples/minitar/minitar.c @@ -408,19 +408,19 @@ static int copy_data(struct archive *ar, struct archive *aw) { int r; - const void *buff; + const void *buffer; size_t size; int64_t offset; for (;;) { - r = archive_read_data_block(ar, &buff, &size, &offset); + r = archive_read_data_block(ar, &buffer, &size, &offset); if (r == ARCHIVE_EOF) return (ARCHIVE_OK); if (r != ARCHIVE_OK) { errmsg(archive_error_string(ar)); return (r); } - r = archive_write_data_block(aw, buff, size, offset); + r = archive_write_data_block(aw, buffer, size, offset); if (r != ARCHIVE_OK) { errmsg(archive_error_string(ar)); return (r); diff --git a/libarchive/archive_cmdline.c b/libarchive/archive_cmdline.c index 5c519cd17f..4695179619 100644 --- a/libarchive/archive_cmdline.c +++ b/libarchive/archive_cmdline.c @@ -73,7 +73,7 @@ get_argument(struct archive_string *as, const char *p) archive_string_empty(as); /* Skip beginning space characters. */ - while (*s != '\0' && *s == ' ') + while (*s == ' ') s++; /* Copy non-space characters. */ while (*s != '\0' && *s != ' ') { diff --git a/libarchive/archive_disk_acl_darwin.c b/libarchive/archive_disk_acl_darwin.c index 48ad016512..de47baa207 100644 --- a/libarchive/archive_disk_acl_darwin.c +++ b/libarchive/archive_disk_acl_darwin.c @@ -76,8 +76,8 @@ static const acl_perm_map_t acl_nfs4_perm_map[] = { #endif }; -static const int acl_nfs4_perm_map_size = - (int)(sizeof(acl_nfs4_perm_map)/sizeof(acl_nfs4_perm_map[0])); +static const size_t acl_nfs4_perm_map_size = + (sizeof(acl_nfs4_perm_map) / sizeof(acl_nfs4_perm_map[0])); static const acl_perm_map_t acl_nfs4_flag_map[] = { {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED}, @@ -87,8 +87,8 @@ static const acl_perm_map_t acl_nfs4_flag_map[] = { {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_ONLY_INHERIT} }; -static const int acl_nfs4_flag_map_size = - (int)(sizeof(acl_nfs4_flag_map)/sizeof(acl_nfs4_flag_map[0])); +static const size_t acl_nfs4_flag_map_size = + (sizeof(acl_nfs4_flag_map) / sizeof(acl_nfs4_flag_map[0])); static int translate_guid(struct archive *a, acl_entry_t acl_entry, int *ae_id, int *ae_tag, const char **ae_name) @@ -124,7 +124,7 @@ static void add_trivial_nfs4_acl(struct archive_entry *entry) { mode_t mode; - int i; + size_t i; const int rperm = ARCHIVE_ENTRY_ACL_READ_DATA; const int wperm = ARCHIVE_ENTRY_ACL_WRITE_DATA | ARCHIVE_ENTRY_ACL_APPEND_DATA; @@ -195,15 +195,13 @@ add_trivial_nfs4_acl(struct archive_entry *entry) } else if ((mode & 0010) || (mode & 0001)) tacl_entry[1].permset |= eperm; - for (i = 0; i < 6; i++) { + for (i = 0; i < sizeof(tacl_entry) / sizeof(tacl_entry[0]); i++) { if (tacl_entry[i].permset != 0) { archive_entry_acl_add_entry(entry, tacl_entry[i].type, tacl_entry[i].permset, tacl_entry[i].tag, -1, NULL); } } - - return; } static int @@ -214,8 +212,9 @@ translate_acl(struct archive_read_disk *a, acl_flagset_t acl_flagset; acl_entry_t acl_entry; acl_permset_t acl_permset; - int i, entry_acl_type; + int entry_acl_type; int r, s, ae_id, ae_tag, ae_perm; + size_t i; const char *ae_name; s = acl_get_entry(acl, ACL_FIRST_ENTRY, &acl_entry); @@ -333,7 +332,7 @@ set_acl(struct archive *a, int fd, const char *name, gid_t ae_gid; const char *ae_name; int entries; - int i; + size_t i; ret = ARCHIVE_OK; entries = archive_acl_reset(abstract_acl, ae_requested_type); diff --git a/libarchive/archive_disk_acl_freebsd.c b/libarchive/archive_disk_acl_freebsd.c index ed4e7a7896..15783fb8fe 100644 --- a/libarchive/archive_disk_acl_freebsd.c +++ b/libarchive/archive_disk_acl_freebsd.c @@ -83,8 +83,8 @@ static const acl_perm_map_t acl_nfs4_perm_map[] = { {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE} }; -static const int acl_nfs4_perm_map_size = - (int)(sizeof(acl_nfs4_perm_map)/sizeof(acl_nfs4_perm_map[0])); +static const size_t acl_nfs4_perm_map_size = + (sizeof(acl_nfs4_perm_map) / sizeof(acl_nfs4_perm_map[0])); static const acl_perm_map_t acl_nfs4_flag_map[] = { {ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_FILE_INHERIT}, @@ -98,8 +98,8 @@ static const acl_perm_map_t acl_nfs4_flag_map[] = { #endif }; -static const int acl_nfs4_flag_map_size = - (int)(sizeof(acl_nfs4_flag_map)/sizeof(acl_nfs4_flag_map[0])); +static const size_t acl_nfs4_flag_map_size = + (sizeof(acl_nfs4_flag_map) / sizeof(acl_nfs4_flag_map[0])); #endif /* ARCHIVE_ACL_FREEBSD_NFS4 */ static int @@ -114,8 +114,10 @@ translate_acl(struct archive_read_disk *a, acl_tag_t acl_tag; acl_entry_t acl_entry; acl_permset_t acl_permset; - int i, entry_acl_type, perm_map_size; + int entry_acl_type; + size_t perm_map_size; const acl_perm_map_t *perm_map; + size_t i; int r, s, ae_id, ae_tag, ae_perm; void *q; const char *ae_name; @@ -332,13 +334,12 @@ set_acl(struct archive *a, int fd, const char *name, #endif int ret; int ae_type, ae_permset, ae_tag, ae_id; - int perm_map_size; + size_t i, perm_map_size; const acl_perm_map_t *perm_map; uid_t ae_uid; gid_t ae_gid; const char *ae_name; int entries; - int i; ret = ARCHIVE_OK; entries = archive_acl_reset(abstract_acl, ae_requested_type); diff --git a/libarchive/archive_disk_acl_linux.c b/libarchive/archive_disk_acl_linux.c index 31d270535c..0673bec257 100644 --- a/libarchive/archive_disk_acl_linux.c +++ b/libarchive/archive_disk_acl_linux.c @@ -62,8 +62,8 @@ static const acl_perm_map_t acl_posix_perm_map[] = { {ARCHIVE_ENTRY_ACL_READ, ACL_READ}, }; -static const int acl_posix_perm_map_size = - (int)(sizeof(acl_posix_perm_map)/sizeof(acl_posix_perm_map[0])); +static const size_t acl_posix_perm_map_size = + (sizeof(acl_posix_perm_map) / sizeof(acl_posix_perm_map[0])); #endif /* ARCHIVE_ACL_LIBACL */ #if ARCHIVE_ACL_LIBRICHACL @@ -87,8 +87,8 @@ static const acl_perm_map_t acl_nfs4_perm_map[] = { {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, RICHACE_SYNCHRONIZE} }; -static const int acl_nfs4_perm_map_size = - (int)(sizeof(acl_nfs4_perm_map)/sizeof(acl_nfs4_perm_map[0])); +static const size_t acl_nfs4_perm_map_size = + (sizeof(acl_nfs4_perm_map)/sizeof(acl_nfs4_perm_map[0])); static const acl_perm_map_t acl_nfs4_flag_map[] = { {ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, RICHACE_FILE_INHERIT_ACE}, @@ -98,8 +98,8 @@ static const acl_perm_map_t acl_nfs4_flag_map[] = { {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, RICHACE_INHERITED_ACE} }; -static const int acl_nfs4_flag_map_size = - (int)(sizeof(acl_nfs4_flag_map)/sizeof(acl_nfs4_flag_map[0])); +static const size_t acl_nfs4_flag_map_size = + (sizeof(acl_nfs4_flag_map) / sizeof(acl_nfs4_flag_map[0])); #endif /* ARCHIVE_ACL_LIBRICHACL */ #if ARCHIVE_ACL_LIBACL @@ -113,8 +113,9 @@ translate_acl(struct archive_read_disk *a, acl_tag_t acl_tag; acl_entry_t acl_entry; acl_permset_t acl_permset; - int i, entry_acl_type; + int entry_acl_type; int r, s, ae_id, ae_tag, ae_perm; + size_t i; void *q; const char *ae_name; @@ -219,7 +220,8 @@ translate_richacl(struct archive_read_disk *a, struct archive_entry *entry, struct richacl *richacl) { int ae_id, ae_tag, ae_perm; - int entry_acl_type, i; + int entry_acl_type; + size_t i; const char *ae_name; struct richace *richace; @@ -326,7 +328,7 @@ set_richacl(struct archive *a, int fd, const char *name, gid_t ae_gid; const char *ae_name; int entries; - int i; + size_t i; int ret; int e = 0; struct richacl *richacl = NULL; @@ -469,7 +471,7 @@ set_acl(struct archive *a, int fd, const char *name, gid_t ae_gid; const char *ae_name; int entries; - int i; + size_t i; int ret; acl_t acl = NULL; acl_entry_t acl_entry; diff --git a/libarchive/archive_disk_acl_sunos.c b/libarchive/archive_disk_acl_sunos.c index 0ef3ad52ee..8587f67154 100644 --- a/libarchive/archive_disk_acl_sunos.c +++ b/libarchive/archive_disk_acl_sunos.c @@ -81,8 +81,8 @@ static const acl_perm_map_t acl_nfs4_perm_map[] = { {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACE_SYNCHRONIZE} }; -static const int acl_nfs4_perm_map_size = - (int)(sizeof(acl_nfs4_perm_map)/sizeof(acl_nfs4_perm_map[0])); +static const size_t acl_nfs4_perm_map_size = + (sizeof(acl_nfs4_perm_map)/sizeof(acl_nfs4_perm_map[0])); static const acl_perm_map_t acl_nfs4_flag_map[] = { {ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT, ACE_FILE_INHERIT_ACE}, @@ -96,8 +96,8 @@ static const acl_perm_map_t acl_nfs4_flag_map[] = { #endif }; -const int acl_nfs4_flag_map_size = - (int)(sizeof(acl_nfs4_flag_map)/sizeof(acl_nfs4_flag_map[0])); +const size_t acl_nfs4_flag_map_size = + (sizeof(acl_nfs4_flag_map) / sizeof(acl_nfs4_flag_map[0])); #endif /* ARCHIVE_ACL_SUNOS_NFS4 */ @@ -164,7 +164,7 @@ sun_acl_is_trivial(void *aclp, int aclcnt, mode_t mode, int is_nfs4, int is_dir, int *trivialp) { #if ARCHIVE_ACL_SUNOS_NFS4 - int i, p; + size_t i, p; const uint32_t rperm = ACE_READ_DATA; const uint32_t wperm = ACE_WRITE_DATA | ACE_APPEND_DATA; const uint32_t eperm = ACE_EXECUTE; @@ -316,10 +316,11 @@ translate_acl(struct archive_read_disk *a, struct archive_entry *entry, void *aclp, int aclcnt, int default_entry_acl_type) { - int e, i; + int e; int ae_id, ae_tag, ae_perm; int entry_acl_type; const char *ae_name; + size_t i; aclent_t *aclent; #if ARCHIVE_ACL_SUNOS_NFS4 ace_t *ace; @@ -454,13 +455,12 @@ set_acl(struct archive *a, int fd, const char *name, void *aclp; int ret; int ae_type, ae_permset, ae_tag, ae_id; - int perm_map_size; + size_t i, perm_map_size; const acl_perm_map_t *perm_map; uid_t ae_uid; gid_t ae_gid; const char *ae_name; int entries; - int i; ret = ARCHIVE_OK; entries = archive_acl_reset(abstract_acl, ae_requested_type); diff --git a/libarchive/archive_entry_link_resolver.c b/libarchive/archive_entry_link_resolver.c index c7d59497a7..480b3b6cef 100644 --- a/libarchive/archive_entry_link_resolver.c +++ b/libarchive/archive_entry_link_resolver.c @@ -254,7 +254,6 @@ archive_entry_linkify(struct archive_entry_linkresolver *res, default: break; } - return; } static struct links_entry * diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c index ab0270bc28..5a0ca5621e 100644 --- a/libarchive/archive_read_disk_entry_from_file.c +++ b/libarchive/archive_read_disk_entry_from_file.c @@ -794,7 +794,8 @@ setup_xattrs(struct archive_read_disk *a, struct archive_entry *entry, int *fd) { int namespaces[2]; - int i, res; + int res; + unsigned i; namespaces[0] = EXTATTR_NAMESPACE_USER; namespaces[1] = EXTATTR_NAMESPACE_SYSTEM; @@ -894,7 +895,8 @@ setup_sparse_fiemap(struct archive_read_disk *a, do_fiemap = 1; size = archive_entry_size(entry); for (iters = 0; ; ++iters) { - int i, r; + size_t i; + int r; r = ioctl(*fd, FS_IOC_FIEMAP, fm); if (r < 0) { @@ -911,7 +913,7 @@ setup_sparse_fiemap(struct archive_read_disk *a, break; } fe = fm->fm_extents; - for (i = 0; i < (int)fm->fm_mapped_extents; i++, fe++) { + for (i = 0; i < fm->fm_mapped_extents; i++, fe++) { if (!(fe->fe_flags & FIEMAP_EXTENT_UNWRITTEN)) { /* The fe_length of the last block does not * adjust itself to its size files. */ diff --git a/libarchive/archive_read_open_fd.c b/libarchive/archive_read_open_fd.c index f59cd07fe6..7356860d2f 100644 --- a/libarchive/archive_read_open_fd.c +++ b/libarchive/archive_read_open_fd.c @@ -134,13 +134,13 @@ file_skip(struct archive *a, void *client_data, int64_t request) struct read_fd_data *mine = (struct read_fd_data *)client_data; int64_t skip = request; int64_t old_offset, new_offset; - int skip_bits = sizeof(skip) * 8 - 1; /* off_t is a signed type. */ if (!mine->use_lseek) return (0); /* Reduce a request that would overflow the 'skip' variable. */ if (sizeof(request) > sizeof(skip)) { + int skip_bits = sizeof(skip) * 8 - 1; /* off_t is a signed type. */ int64_t max_skip = (((int64_t)1 << (skip_bits - 1)) - 1) * 2 + 1; if (request > max_skip) diff --git a/libarchive/archive_read_open_file.c b/libarchive/archive_read_open_file.c index 03719e8bff..6108f109c4 100644 --- a/libarchive/archive_read_open_file.c +++ b/libarchive/archive_read_open_file.c @@ -130,7 +130,6 @@ file_skip(struct archive *a, void *client_data, int64_t request) #else long skip = (long)request; #endif - int skip_bits = sizeof(skip) * 8 - 1; (void)a; /* UNUSED */ @@ -145,6 +144,7 @@ file_skip(struct archive *a, void *client_data, int64_t request) /* If request is too big for a long or an off_t, reduce it. */ if (sizeof(request) > sizeof(skip)) { + int skip_bits = sizeof(skip) * 8 - 1; int64_t max_skip = (((int64_t)1 << (skip_bits - 1)) - 1) * 2 + 1; if (request > max_skip) diff --git a/libarchive/archive_read_support_filter_bzip2.c b/libarchive/archive_read_support_filter_bzip2.c index 793d605c87..0e1b4d8883 100644 --- a/libarchive/archive_read_support_filter_bzip2.c +++ b/libarchive/archive_read_support_filter_bzip2.c @@ -192,7 +192,7 @@ bzip2_reader_init(struct archive_read_filter *self) self->code = ARCHIVE_FILTER_BZIP2; self->name = "bzip2"; - state = (struct private_data *)calloc(sizeof(*state), 1); + state = (struct private_data *)calloc(1, sizeof(*state)); out_block = (unsigned char *)malloc(out_block_size); if (state == NULL || out_block == NULL) { archive_set_error(&self->archive->archive, ENOMEM, diff --git a/libarchive/archive_read_support_filter_compress.c b/libarchive/archive_read_support_filter_compress.c index 05b80a576a..8ce4a52bf8 100644 --- a/libarchive/archive_read_support_filter_compress.c +++ b/libarchive/archive_read_support_filter_compress.c @@ -218,7 +218,7 @@ compress_bidder_init(struct archive_read_filter *self) self->code = ARCHIVE_FILTER_COMPRESS; self->name = "compress (.Z)"; - state = (struct private_data *)calloc(sizeof(*state), 1); + state = (struct private_data *)calloc(1, sizeof(*state)); out_block = malloc(out_block_size); if (state == NULL || out_block == NULL) { free(out_block); diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c index 4135a63618..9b9be2a421 100644 --- a/libarchive/archive_read_support_filter_gzip.c +++ b/libarchive/archive_read_support_filter_gzip.c @@ -310,7 +310,7 @@ gzip_bidder_init(struct archive_read_filter *self) self->code = ARCHIVE_FILTER_GZIP; self->name = "gzip"; - state = (struct private_data *)calloc(sizeof(*state), 1); + state = (struct private_data *)calloc(1, sizeof(*state)); out_block = (unsigned char *)malloc(out_block_size); if (state == NULL || out_block == NULL) { free(out_block); diff --git a/libarchive/archive_read_support_filter_lz4.c b/libarchive/archive_read_support_filter_lz4.c index 1e99542d7b..7d23597a5e 100644 --- a/libarchive/archive_read_support_filter_lz4.c +++ b/libarchive/archive_read_support_filter_lz4.c @@ -225,7 +225,7 @@ lz4_reader_init(struct archive_read_filter *self) self->code = ARCHIVE_FILTER_LZ4; self->name = "lz4"; - state = (struct private_data *)calloc(sizeof(*state), 1); + state = (struct private_data *)calloc(1, sizeof(*state)); if (state == NULL) { archive_set_error(&self->archive->archive, ENOMEM, "Can't allocate data for lz4 decompression"); diff --git a/libarchive/archive_read_support_filter_lzop.c b/libarchive/archive_read_support_filter_lzop.c index 4ebdd3bf3e..44782bc180 100644 --- a/libarchive/archive_read_support_filter_lzop.c +++ b/libarchive/archive_read_support_filter_lzop.c @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_UNISTD_H -#include -#endif #ifdef HAVE_LZO_LZOCONF_H #include #endif @@ -187,7 +184,7 @@ lzop_bidder_init(struct archive_read_filter *self) self->code = ARCHIVE_FILTER_LZOP; self->name = "lzop"; - state = (struct read_lzop *)calloc(sizeof(*state), 1); + state = (struct read_lzop *)calloc(1, sizeof(*state)); if (state == NULL) { archive_set_error(&self->archive->archive, ENOMEM, "Can't allocate data for lzop decompression"); diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c index 67a979cd78..87e9f2ec19 100644 --- a/libarchive/archive_read_support_filter_rpm.c +++ b/libarchive/archive_read_support_filter_rpm.c @@ -141,7 +141,7 @@ rpm_bidder_init(struct archive_read_filter *self) self->code = ARCHIVE_FILTER_RPM; self->name = "rpm"; - rpm = (struct rpm *)calloc(sizeof(*rpm), 1); + rpm = (struct rpm *)calloc(1, sizeof(*rpm)); if (rpm == NULL) { archive_set_error(&self->archive->archive, ENOMEM, "Can't allocate data for rpm"); diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c index 209b2a1593..db8613ec05 100644 --- a/libarchive/archive_read_support_filter_uu.c +++ b/libarchive/archive_read_support_filter_uu.c @@ -367,7 +367,7 @@ uudecode_bidder_init(struct archive_read_filter *self) self->code = ARCHIVE_FILTER_UU; self->name = "uu"; - uudecode = (struct uudecode *)calloc(sizeof(*uudecode), 1); + uudecode = (struct uudecode *)calloc(1, sizeof(*uudecode)); out_buff = malloc(OUT_BUFF_SIZE); in_buff = malloc(IN_BUFF_SIZE); if (uudecode == NULL || out_buff == NULL || in_buff == NULL) { diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c index e313d39c0c..2b3cc2c552 100644 --- a/libarchive/archive_read_support_filter_xz.c +++ b/libarchive/archive_read_support_filter_xz.c @@ -478,7 +478,7 @@ xz_lzma_bidder_init(struct archive_read_filter *self) struct private_data *state; int ret; - state = (struct private_data *)calloc(sizeof(*state), 1); + state = (struct private_data *)calloc(1, sizeof(*state)); out_block = (unsigned char *)malloc(out_block_size); if (state == NULL || out_block == NULL) { archive_set_error(&self->archive->archive, ENOMEM, diff --git a/libarchive/archive_read_support_filter_zstd.c b/libarchive/archive_read_support_filter_zstd.c index 1959b5ac39..c22ef2a2a1 100644 --- a/libarchive/archive_read_support_filter_zstd.c +++ b/libarchive/archive_read_support_filter_zstd.c @@ -27,10 +27,6 @@ __FBSDID("$FreeBSD$"); -#ifdef HAVE_ERRNO_H -#include -#endif - #ifdef HAVE_ERRNO_H #include #endif @@ -177,7 +173,7 @@ zstd_bidder_init(struct archive_read_filter *self) self->code = ARCHIVE_FILTER_ZSTD; self->name = "zstd"; - state = (struct private_data *)calloc(sizeof(*state), 1); + state = (struct private_data *)calloc(1, sizeof(*state)); out_block = (unsigned char *)malloc(out_block_size); dstream = ZSTD_createDStream(); diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c index 8f239da9b3..a93fcae14e 100644 --- a/libarchive/archive_read_support_format_rar.c +++ b/libarchive/archive_read_support_format_rar.c @@ -734,7 +734,7 @@ archive_read_support_format_rar(struct archive *_a) archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, "archive_read_support_format_rar"); - rar = (struct rar *)calloc(sizeof(*rar), 1); + rar = (struct rar *)calloc(1, sizeof(*rar)); if (rar == NULL) { archive_set_error(&a->archive, ENOMEM, "Can't allocate rar data"); @@ -2566,8 +2566,7 @@ read_next_symbol(struct archive_read *a, struct huffman_code *code) rar_br_consume(br, code->tablesize); node = value; - while (!(code->tree[node].branches[0] == - code->tree[node].branches[1])) + while (code->tree[node].branches[0] != code->tree[node].branches[1]) { if (!rar_br_read_ahead(a, br, 1)) { archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, diff --git a/libarchive/archive_write_add_filter_compress.c b/libarchive/archive_write_add_filter_compress.c index 3ed269fce9..0771d4f82c 100644 --- a/libarchive/archive_write_add_filter_compress.c +++ b/libarchive/archive_write_add_filter_compress.c @@ -349,7 +349,7 @@ archive_compressor_compress_write(struct archive_write_filter *f, --length; } - while (length--) { + for (; length; length--) { c = *bp++; state->in_count++; state->cur_fcode = (c << 16) | state->cur_code; diff --git a/libarchive/archive_write_add_filter_zstd.c b/libarchive/archive_write_add_filter_zstd.c index f32258b460..b7920f3da5 100644 --- a/libarchive/archive_write_add_filter_zstd.c +++ b/libarchive/archive_write_add_filter_zstd.c @@ -352,7 +352,7 @@ drive_compressor(struct archive_write_filter *f, struct private_data *data, int flush, const void *src, size_t length) { ZSTD_inBuffer in = { .src = src, .size = length, .pos = 0 }; - size_t ipos, opos, zstdret = 0; + size_t ipos, opos, zstdret; int ret; for (;;) { diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c index f28aaefdce..05b85bd4f2 100644 --- a/libarchive/archive_write_disk_posix.c +++ b/libarchive/archive_write_disk_posix.c @@ -707,7 +707,7 @@ _archive_write_disk_header(struct archive *_a, struct archive_entry *entry) const void *attr_value; size_t attr_size; int i = archive_entry_xattr_reset(a->entry); - while (i--) { + for (; i > 0; i--) { archive_entry_xattr_next(a->entry, &attr_name, &attr_value, &attr_size); if (attr_name != NULL && attr_value != NULL && @@ -1254,7 +1254,7 @@ hfs_decompress(struct archive_write_disk *a) block_info = (uint32_t *)(a->resource_fork + RSRC_H_SIZE); block_count = archive_le32dec(block_info++); - while (block_count--) { + for (; block_count; block_count--) { data_pos = RSRC_H_SIZE + archive_le32dec(block_info++); data_size = archive_le32dec(block_info++); r = fgetxattr(a->fd, XATTR_RESOURCEFORK_NAME, @@ -1731,9 +1731,10 @@ _archive_write_disk_finish_entry(struct archive *_a) else r = hfs_write_data_block( a, null_d, a->file_remaining_bytes); - if (r < 0) - close_file_descriptor(a); - return ((int)r); + if (r < 0) { + close_file_descriptor(a); + return ((int) r); + } } #endif } else { @@ -2063,7 +2064,6 @@ edit_deep_directories(struct archive_write_disk *a) /* The chdir() succeeded; we've now shortened the path. */ a->name = tail; } - return; } #endif @@ -3890,7 +3890,7 @@ set_fflags(struct archive_write_disk *a) * The first test encourages the compiler to eliminate * all of this if it's not necessary. */ - if ((critical_flags != 0) && (set & critical_flags)) { + if ((set & critical_flags) != 0) { le = current_fixup(a, a->name); if (le == NULL) return (ARCHIVE_FATAL); @@ -4488,7 +4488,7 @@ set_xattrs(struct archive_write_disk *a) archive_string_init(&errlist); - while (i--) { + for (; i > 0; i--) { const char *name; const void *value; size_t size; @@ -4574,11 +4574,11 @@ set_xattrs(struct archive_write_disk *a) struct archive_string errlist; int ret = ARCHIVE_OK; int i = archive_entry_xattr_reset(entry); - short fail = 0; + int fail = 0; archive_string_init(&errlist); - while (i--) { + for (; i > 0; i--) { const char *name; const void *value; size_t size; @@ -4631,7 +4631,7 @@ set_xattrs(struct archive_write_disk *a) e = extattr_set_fd(a->fd, namespace, name, value, size); if (e == 0 && errno == 0) { - e = size; + e = (int)size; } } else { e = extattr_set_link( diff --git a/libarchive/archive_write_set_format_gnutar.c b/libarchive/archive_write_set_format_gnutar.c index ec29c5c418..a39337f040 100644 --- a/libarchive/archive_write_set_format_gnutar.c +++ b/libarchive/archive_write_set_format_gnutar.c @@ -298,7 +298,7 @@ archive_write_gnutar_header(struct archive_write *a, /* Only regular files (not hardlinks) have data. */ if (archive_entry_hardlink(entry) != NULL || archive_entry_symlink(entry) != NULL || - !(archive_entry_filetype(entry) == AE_IFREG)) + archive_entry_filetype(entry) != AE_IFREG) archive_entry_set_size(entry, 0); if (AE_IFDIR == archive_entry_filetype(entry)) { diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c index c9c1591646..0a55618d35 100644 --- a/libarchive/archive_write_set_format_pax.c +++ b/libarchive/archive_write_set_format_pax.c @@ -395,7 +395,7 @@ archive_write_pax_header_xattrs(struct archive_write *a, { int i = archive_entry_xattr_reset(entry); - while (i--) { + for (; i > 0; i--) { const char *name; const void *value; char *url_encoded_name = NULL, *encoded_name = NULL; @@ -420,7 +420,6 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_write_pax_header_xattr(pax, encoded_name, value, size); - } return (ARCHIVE_OK); } diff --git a/libarchive/archive_write_set_format_ustar.c b/libarchive/archive_write_set_format_ustar.c index d1a06bc4f7..99475d835a 100644 --- a/libarchive/archive_write_set_format_ustar.c +++ b/libarchive/archive_write_set_format_ustar.c @@ -265,7 +265,7 @@ archive_write_ustar_header(struct archive_write *a, struct archive_entry *entry) /* Only regular files (not hardlinks) have data. */ if (archive_entry_hardlink(entry) != NULL || archive_entry_symlink(entry) != NULL || - !(archive_entry_filetype(entry) == AE_IFREG)) + archive_entry_filetype(entry) != AE_IFREG) archive_entry_set_size(entry, 0); if (AE_IFDIR == archive_entry_filetype(entry)) { diff --git a/libarchive/archive_write_set_format_v7tar.c b/libarchive/archive_write_set_format_v7tar.c index 5994071441..2917a769d2 100644 --- a/libarchive/archive_write_set_format_v7tar.c +++ b/libarchive/archive_write_set_format_v7tar.c @@ -243,7 +243,7 @@ archive_write_v7tar_header(struct archive_write *a, struct archive_entry *entry) /* Only regular files (not hardlinks) have data. */ if (archive_entry_hardlink(entry) != NULL || archive_entry_symlink(entry) != NULL || - !(archive_entry_filetype(entry) == AE_IFREG)) + archive_entry_filetype(entry) != AE_IFREG) archive_entry_set_size(entry, 0); if (AE_IFDIR == archive_entry_filetype(entry)) { diff --git a/libarchive_fe/passphrase.c b/libarchive_fe/passphrase.c index 1cae6a7bc8..c64f81d60c 100644 --- a/libarchive_fe/passphrase.c +++ b/libarchive_fe/passphrase.c @@ -331,7 +331,6 @@ lafe_readpassphrase(const char *prompt, char *buf, size_t bufsiz) break; default: lafe_errc(1, errno, "Couldn't read passphrase"); - break; } } return (p); diff --git a/tar/bsdtar.c b/tar/bsdtar.c index 75249d1052..6e02f67e0e 100644 --- a/tar/bsdtar.c +++ b/tar/bsdtar.c @@ -738,7 +738,6 @@ main(int argc, char **argv) break; case OPTION_VERSION: /* GNU convention */ version(); - break; #if 0 /* * The -W longopt feature is handled inside of diff --git a/test_utils/test_main.c b/test_utils/test_main.c index e4b884ee3c..0844060a9b 100644 --- a/test_utils/test_main.c +++ b/test_utils/test_main.c @@ -1245,7 +1245,7 @@ assertion_file_contains_lines_any_order(const char *file, int line, c = *p; } if (actual_count) { - actual = calloc(sizeof(char *), actual_count); + actual = calloc(actual_count, sizeof(char *)); if (actual == NULL) { failure_start(pathname, line, "Can't allocate memory"); failure_finish(NULL); @@ -1637,8 +1637,9 @@ assertion_file_size(const char *file, int line, const char *pathname, long size) { BY_HANDLE_FILE_INFORMATION bhfi; r = !my_GetFileInformationByName(pathname, &bhfi); - filesize = ((int64_t)bhfi.nFileSizeHigh << 32) + bhfi.nFileSizeLow; - } + filesize = + ((int64_t)bhfi.nFileSizeHigh << 32) | bhfi.nFileSizeLow; + } #else { struct stat st;