cd0f6b0c9
Denys Vlasenko
2010-07-01
Subject
consolidate xz format comment. no code changes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/rpm2cpio.c+0 -2
| @@ -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; | |
include/unarchive.h+2 -0
| @@ -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: */ | |
libbb/read_printf.c+0 -2
| @@ -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) { | |