]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Eliminate dead assignment.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Thu, 14 Aug 2014 07:48:47 +0000 (16:48 +0900)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Thu, 14 Aug 2014 07:48:47 +0000 (16:48 +0900)
libarchive/archive_read_append_filter.c
libarchive/archive_read_support_filter_lzop.c

index 017d7c68a4b39203d94f40b2ccf2ed83a90d8cce..1505ea60af28bdc9ca39c4e0e455462205dad2b4 100644 (file)
@@ -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:
index f8d04bd0ea5746b07355a85da1e8571ad036daff..44ac9964ae1140ce05e938dacb7c2992880abf97 100644 (file)
@@ -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");