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-cd0f6b0c939e5098410ddb171db8c4a26cf8d623.tar.gz | |
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) if (ENABLE_FEATURE_SEAMLESS_XZ && magic.b16[0] == XZ_MAGIC1 ) { - /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ - /* More info at: http://tukaani.org/xz/xz-file-format.txt */ xread(rpm_fd, magic.b32, sizeof(magic.b32[0])); if (magic.b32[0] != XZ_MAGIC2) 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 { COMPRESS_MAGIC = 0x1f9d, GZIP_MAGIC = 0x1f8b, BZIP2_MAGIC = 'B' * 256 + 'Z', + /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ + /* More info at: http://tukaani.org/xz/xz-file-format.txt */ XZ_MAGIC1 = 0xfd * 256 + '7', XZ_MAGIC2 = (('z' * 256 + 'X') * 256 + 'Z') * 256 + 0, /* 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*/) if (ENABLE_FEATURE_SEAMLESS_XZ && magic.b16[0] == XZ_MAGIC1 ) { - /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ - /* More info at: http://tukaani.org/xz/xz-file-format.txt */ offset = -6; xread(fd, magic.b32, sizeof(magic.b32[0])); if (magic.b32[0] == XZ_MAGIC2) { |