consolidate xz format comment. no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index b23d5afa9669ba71c87560537e4b2b09fea2bbc8..5bc50b88f293645a57d6561dd7cf46f606e5c886 100644 (file)
--- 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 3b8e1575aa669e06f53a73cd26d372326c8fa78f..b55af6d9d85a9e4f114d4da3cf4dc50403edc4cc 100644 (file)
--- 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 6780b94efc472b2970695c48808fa116faaa2f7e..1b215f97ac86a89b12a16550a0bb068cafb887e1 100644 (file)
--- 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) {