Remove unreachable 'break' statements (#2451)

diff --git a/libarchive/archive_read_support_filter_by_code.c b/libarchive/archive_read_support_filter_by_code.c
index ce50d8cdf884526f6052fbb16176c25c8b9c6e7d..4c8b6cb59c2a0ccb3344215a37370876f99907ff 100644 (file)
--- a/libarchive/archive_read_support_filter_by_code.c
+++ b/libarchive/archive_read_support_filter_by_code.c
@@ -37,46 +37,32 @@ archive_read_support_filter_by_code(struct archive *a, int filter_code)
        switch (filter_code) {
        case ARCHIVE_FILTER_NONE:
                return archive_read_support_filter_none(a);
-               break;
        case ARCHIVE_FILTER_GZIP:
                return archive_read_support_filter_gzip(a);
-               break;
        case ARCHIVE_FILTER_BZIP2:
                return archive_read_support_filter_bzip2(a);
-               break;
        case ARCHIVE_FILTER_COMPRESS:
                return archive_read_support_filter_compress(a);
-               break;
        case ARCHIVE_FILTER_LZMA:
                return archive_read_support_filter_lzma(a);
-               break;
        case ARCHIVE_FILTER_XZ:
                return archive_read_support_filter_xz(a);
-               break;
        case ARCHIVE_FILTER_UU:
                return archive_read_support_filter_uu(a);
-               break;
        case ARCHIVE_FILTER_RPM:
                return archive_read_support_filter_rpm(a);
-               break;
        case ARCHIVE_FILTER_LZIP:
                return archive_read_support_filter_lzip(a);
-               break;
        case ARCHIVE_FILTER_LRZIP:
                return archive_read_support_filter_lrzip(a);
-               break;
        case ARCHIVE_FILTER_LZOP:
                return archive_read_support_filter_lzop(a);
-               break;
        case ARCHIVE_FILTER_GRZIP:
                return archive_read_support_filter_grzip(a);
-               break;
        case ARCHIVE_FILTER_LZ4:
                return archive_read_support_filter_lz4(a);
-               break;
        case ARCHIVE_FILTER_ZSTD:
                return archive_read_support_filter_zstd(a);
-               break;
        }
        return (ARCHIVE_FATAL);
 }

diff --git a/libarchive/archive_read_support_filter_lz4.c b/libarchive/archive_read_support_filter_lz4.c
index 8c9777156409827ed4b44d8de91132b47b8bafe2..760e6d938d2a824572d64fc8d91712ff73360ba1 100644 (file)
--- a/libarchive/archive_read_support_filter_lz4.c
+++ b/libarchive/archive_read_support_filter_lz4.c
@@ -323,7 +323,6 @@ lz4_filter_read(struct archive_read_filter *self, const void **p)
                archive_set_error(&self->archive->archive,
                    ARCHIVE_ERRNO_MISC, "Program error.");
                return (ARCHIVE_FATAL);
-               break;
        }
 
        while (state->stage == SELECT_STREAM) {

diff --git a/libarchive/archive_read_support_format_by_code.c b/libarchive/archive_read_support_format_by_code.c
index 7ed045f5688c573b2d1c4d4891b4452bef0f3ab3..982e2db70f97585858608b3b5312847058e6d588 100644 (file)
--- a/libarchive/archive_read_support_format_by_code.c
+++ b/libarchive/archive_read_support_format_by_code.c
@@ -41,49 +41,34 @@ archive_read_support_format_by_code(struct archive *a, int format_code)
        switch (format_code & ARCHIVE_FORMAT_BASE_MASK) {
        case ARCHIVE_FORMAT_7ZIP:
                return archive_read_support_format_7zip(a);
-               break;
        case ARCHIVE_FORMAT_AR:
                return archive_read_support_format_ar(a);
-               break;
        case ARCHIVE_FORMAT_CAB:
                return archive_read_support_format_cab(a);
-               break;
        case ARCHIVE_FORMAT_CPIO:
                return archive_read_support_format_cpio(a);
-               break;
        case ARCHIVE_FORMAT_EMPTY:
                return archive_read_support_format_empty(a);
-               break;
        case ARCHIVE_FORMAT_ISO9660:
                return archive_read_support_format_iso9660(a);
-               break;
        case ARCHIVE_FORMAT_LHA:
                return archive_read_support_format_lha(a);
-               break;
        case ARCHIVE_FORMAT_MTREE:
                return archive_read_support_format_mtree(a);
-               break;
        case ARCHIVE_FORMAT_RAR:
                return archive_read_support_format_rar(a);
-               break;
        case ARCHIVE_FORMAT_RAR_V5:
                return archive_read_support_format_rar5(a);
-               break;
        case ARCHIVE_FORMAT_RAW:
                return archive_read_support_format_raw(a);
-               break;
        case ARCHIVE_FORMAT_TAR:
                return archive_read_support_format_tar(a);
-               break;
        case ARCHIVE_FORMAT_WARC:
                return archive_read_support_format_warc(a);
-               break;
        case ARCHIVE_FORMAT_XAR:
                return archive_read_support_format_xar(a);
-               break;
        case ARCHIVE_FORMAT_ZIP:
                return archive_read_support_format_zip(a);
-               break;
        }
        archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER,
            "Invalid format code specified");

diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
index 96d08aa6c2d3bf1f40c6841d18e5c51b329cee8e..8a2197fdfe3aa71c4c9dd3dc406e6fa3d14bd360 100644 (file)
--- a/libarchive/archive_read_support_format_xar.c
+++ b/libarchive/archive_read_support_format_xar.c
@@ -2842,7 +2842,6 @@ xml_data(void *userData, const char *s, size_t len)
                xar->file->has |= HAS_XATTR;
                archive_strncpy(&(xar->xattr->fstype), s, len);
                break;
-               break;
        case FILE_ACL_DEFAULT:
        case FILE_ACL_ACCESS:
        case FILE_ACL_APPLEEXTENDED:

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 3e62533bf2d9c18b3a9be8bcd9de02f46bbb2313..e21048b74ae70e1153a31fecadc5bf5163484d2a 100644 (file)
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -3168,7 +3168,6 @@ archive_read_format_zip_read_data(struct archive_read *a,
                /* We can't decompress this entry, but we will
                 * be able to skip() it and try the next entry. */
                return (ARCHIVE_FAILED);
-               break;
        }
        if (r != ARCHIVE_OK)
                return (r);