summaryrefslogtreecommitdiff
path: root/libarchive/archive_read_support_filter_rpm.c
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@gmail.com>2011-08-31 00:10:45 -0400
committerTim Kientzle <kientzle@gmail.com>2011-08-31 00:10:45 -0400
commitd00167e1153725993137a9fdc61e6f5f2f630a6c (patch)
tree153c444a14c3473272691b5c45f00c7373700da5 /libarchive/archive_read_support_filter_rpm.c
parent66672f1ef6901554ac5d2957cf9481d930ec9dc7 (diff)
downloadlibarchive-d00167e1153725993137a9fdc61e6f5f2f630a6c.tar.gz
Issue 175: Simplify filter bidding code.
SVN-Revision: 3663
Diffstat (limited to 'libarchive/archive_read_support_filter_rpm.c')
-rw-r--r--libarchive/archive_read_support_filter_rpm.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c
index a4bb0d0f..7dbfc0eb 100644
--- a/libarchive/archive_read_support_filter_rpm.c
+++ b/libarchive/archive_read_support_filter_rpm.c
@@ -108,20 +108,11 @@ rpm_bidder_bid(struct archive_read_filter_bidder *self,
bits_checked = 0;
/*
- * Verify Header Magic Bytes : 0xed 0xab 0xee 0xdb
+ * Verify Header Magic Bytes : 0XED 0XAB 0XEE 0XDB
*/
- if (b[0] != 0xed)
+ if (memcmp(b, "\xED\xAB\xEE\xDB", 4) != 0)
return (0);
- bits_checked += 8;
- if (b[1] != 0xab)
- return (0);
- bits_checked += 8;
- if (b[2] != 0xee)
- return (0);
- bits_checked += 8;
- if (b[3] != 0xdb)
- return (0);
- bits_checked += 8;
+ bits_checked += 32;
/*
* Check major version.
*/