Convert /proc/device-tree/ to seq_file

[safe/jmp/linux-2.6] / lib / decompress.c

diff --git a/lib/decompress.c b/lib/decompress.c
index edac55c..d2842f5 100644 (file)
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -13,21 +13,25 @@
 #include <linux/types.h>
 #include <linux/string.h>
 
+#ifndef CONFIG_DECOMPRESS_GZIP
+# define gunzip NULL
+#endif
+#ifndef CONFIG_DECOMPRESS_BZIP2
+# define bunzip2 NULL
+#endif
+#ifndef CONFIG_DECOMPRESS_LZMA
+# define unlzma NULL
+#endif
+
 static const struct compress_format {
        unsigned char magic[2];
        const char *name;
        decompress_fn decompressor;
 } compressed_formats[] = {
-#ifdef CONFIG_DECOMPRESS_GZIP
        { {037, 0213}, "gzip", gunzip },
        { {037, 0236}, "gzip", gunzip },
-#endif
-#ifdef CONFIG_DECOMPRESS_BZIP2
        { {0x42, 0x5a}, "bzip2", bunzip2 },
-#endif
-#ifdef CONFIG_DECOMPRESS_LZMA
        { {0x5d, 0x00}, "lzma", unlzma },
-#endif
        { {0, 0}, NULL, NULL }
 };
 
@@ -39,7 +43,7 @@ decompress_fn decompress_method(const unsigned char *inbuf, int len,
        if (len < 2)
                return NULL;    /* Need at least this much... */
 
-       for (cf = compressed_formats; cf->decompressor; cf++) {
+       for (cf = compressed_formats; cf->name; cf++) {
                if (!memcmp(inbuf, cf->magic, 2))
                        break;