diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-01 10:38:10 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-01 10:38:10 +0200 |
commit | cd0f6b0c939e5098410ddb171db8c4a26cf8d623 (patch) | |
tree | 809a47281ade3f9c0f4859070d937d01687a735f | |
parent | 81199672bed1446fa6b584728c92ecfb11bc530b (diff) | |
download | busybox-w32-cd0f6b0c939e5098410ddb171db8c4a26cf8d623.tar.gz busybox-w32-cd0f6b0c939e5098410ddb171db8c4a26cf8d623.tar.bz2 busybox-w32-cd0f6b0c939e5098410ddb171db8c4a26cf8d623.zip |
consolidate xz format comment. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | archival/rpm2cpio.c | 2 | ||||
-rw-r--r-- | include/unarchive.h | 2 | ||||
-rw-r--r-- | libbb/read_printf.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c index b23d5afa9..5bc50b88f 100644 --- a/archival/rpm2cpio.c +++ b/archival/rpm2cpio.c | |||
@@ -87,8 +87,6 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv) | |||
87 | if (ENABLE_FEATURE_SEAMLESS_XZ | 87 | if (ENABLE_FEATURE_SEAMLESS_XZ |
88 | && magic.b16[0] == XZ_MAGIC1 | 88 | && magic.b16[0] == XZ_MAGIC1 |
89 | ) { | 89 | ) { |
90 | /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ | ||
91 | /* More info at: http://tukaani.org/xz/xz-file-format.txt */ | ||
92 | xread(rpm_fd, magic.b32, sizeof(magic.b32[0])); | 90 | xread(rpm_fd, magic.b32, sizeof(magic.b32[0])); |
93 | if (magic.b32[0] != XZ_MAGIC2) | 91 | if (magic.b32[0] != XZ_MAGIC2) |
94 | goto no_magic; | 92 | goto no_magic; |
diff --git a/include/unarchive.h b/include/unarchive.h index 3b8e1575a..b55af6d9d 100644 --- a/include/unarchive.h +++ b/include/unarchive.h | |||
@@ -9,6 +9,8 @@ enum { | |||
9 | COMPRESS_MAGIC = 0x1f9d, | 9 | COMPRESS_MAGIC = 0x1f9d, |
10 | GZIP_MAGIC = 0x1f8b, | 10 | GZIP_MAGIC = 0x1f8b, |
11 | BZIP2_MAGIC = 'B' * 256 + 'Z', | 11 | BZIP2_MAGIC = 'B' * 256 + 'Z', |
12 | /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ | ||
13 | /* More info at: http://tukaani.org/xz/xz-file-format.txt */ | ||
12 | XZ_MAGIC1 = 0xfd * 256 + '7', | 14 | XZ_MAGIC1 = 0xfd * 256 + '7', |
13 | XZ_MAGIC2 = (('z' * 256 + 'X') * 256 + 'Z') * 256 + 0, | 15 | XZ_MAGIC2 = (('z' * 256 + 'X') * 256 + 'Z') * 256 + 0, |
14 | /* Different form: 32 bits, then 16 bits: */ | 16 | /* Different form: 32 bits, then 16 bits: */ |
diff --git a/libbb/read_printf.c b/libbb/read_printf.c index 6780b94ef..1b215f97a 100644 --- a/libbb/read_printf.c +++ b/libbb/read_printf.c | |||
@@ -289,8 +289,6 @@ void FAST_FUNC setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) | |||
289 | if (ENABLE_FEATURE_SEAMLESS_XZ | 289 | if (ENABLE_FEATURE_SEAMLESS_XZ |
290 | && magic.b16[0] == XZ_MAGIC1 | 290 | && magic.b16[0] == XZ_MAGIC1 |
291 | ) { | 291 | ) { |
292 | /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ | ||
293 | /* More info at: http://tukaani.org/xz/xz-file-format.txt */ | ||
294 | offset = -6; | 292 | offset = -6; |
295 | xread(fd, magic.b32, sizeof(magic.b32[0])); | 293 | xread(fd, magic.b32, sizeof(magic.b32[0])); |
296 | if (magic.b32[0] == XZ_MAGIC2) { | 294 | if (magic.b32[0] == XZ_MAGIC2) { |