From: Michihiro NAKAJIMA Date: Thu, 14 Aug 2014 07:48:47 +0000 (+0900) Subject: Eliminate dead assignment. X-Git-Tag: v3.1.900a~248 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a0c03a5faf1fffdaf6a32f793fdbfe88d9601fd;p=thirdparty%2Flibarchive.git Eliminate dead assignment. --- diff --git a/libarchive/archive_read_append_filter.c b/libarchive/archive_read_append_filter.c index 017d7c68a..1505ea60a 100644 --- a/libarchive/archive_read_append_filter.c +++ b/libarchive/archive_read_append_filter.c @@ -43,7 +43,7 @@ archive_read_append_filter(struct archive *_a, int code) struct archive_read_filter *filter; struct archive_read *a = (struct archive_read *)_a; - r1 = r2 = (ARCHIVE_OK); + r2 = (ARCHIVE_OK); switch (code) { case ARCHIVE_FILTER_NONE: diff --git a/libarchive/archive_read_support_filter_lzop.c b/libarchive/archive_read_support_filter_lzop.c index f8d04bd0e..44ac9964a 100644 --- a/libarchive/archive_read_support_filter_lzop.c +++ b/libarchive/archive_read_support_filter_lzop.c @@ -242,10 +242,17 @@ consume_header(struct archive_read_filter *self) if (version >= 0x940) { unsigned level = *p++; +#if 0 unsigned default_level[] = {0, 3, 1, 9}; +#endif if (level == 0) /* Method is 1..3 here due to check above. */ +#if 0 /* Avoid an error Clang Static Analyzer claims + "Value stored to 'level' is never read". */ level = default_level[method]; +#else + ;/* NOP */ +#endif else if (level > 9) { archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC, "Invalid level");