xen/decompress: make helper symbols static

The individual decompression CUs need to only surface their top level
functions to other code. Arrange for everything else to be static, to
make sure no undue uses of that code exist or will appear without
explicitly noticing. (In some cases this also results in code size
reduction, but since this is all init-only code this probably doesn't
matter very much.)

In the LZO case also take the opportunity and convert u8 where lines
get touched anyway.

The downside is that the top level functions will now be non-static
in stubdom builds of libxenguest, but I think that's acceptable. This
does require declaring them first, though, as the compiler warns about
the lack of declarations.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wl@xen.org>

diff --git a/tools/libs/guest/xg_dom_decompress_unsafe.h b/tools/libs/guest/xg_dom_decompress_unsafe.h
index 969846cb322c24b188769f00f7c105f07f0d22dd..4e0bf23aa58797db100208a2f57de0b98829cfee 100644 (file)
--- a/tools/libs/guest/xg_dom_decompress_unsafe.h
+++ b/tools/libs/guest/xg_dom_decompress_unsafe.h
@@ -1,8 +1,12 @@
+#ifdef __MINIOS__
+# include "../../xen/include/xen/decompress.h"
+#else
 typedef int decompress_fn(unsigned char *inbuf, unsigned int len,
                           int (*fill)(void*, unsigned int),
                           int (*flush)(void*, unsigned int),
                           unsigned char *outbuf, unsigned int *posp,
                           void (*error)(const char *x));
+#endif
 
 int xc_dom_decompress_unsafe(
     decompress_fn fn, struct xc_dom_image *dom, void **blob, size_t *size)

diff --git a/xen/common/bunzip2.c b/xen/common/bunzip2.c
index 6d6e8b19fdd7b1f09f841c59a1b63b2e2356d10b..6aeac79f1a4534b307f4a97fd477da82ca565993 100644 (file)
--- a/xen/common/bunzip2.c
+++ b/xen/common/bunzip2.c
@@ -665,12 +665,11 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, int len,
 
 /* Example usage: decompress src_fd to dst_fd.  (Stops at end of bzip2 data,
    not end of file.) */
-STATIC int INIT bunzip2(unsigned char *buf, unsigned int len,
-                       int(*fill)(void*, unsigned int),
-                       int(*flush)(void*, unsigned int),
-                       unsigned char *outbuf,
-                       unsigned int *pos,
-                       void(*error)(const char *x))
+int INIT bunzip2(unsigned char *buf, unsigned int len,
+                int(*fill)(void*, unsigned int),
+                int(*flush)(void*, unsigned int),
+                unsigned char *outbuf, unsigned int *pos,
+                void(*error)(const char *x))
 {
        struct bunzip_data *bd;
        int i = -1;

diff --git a/xen/common/decompress.h b/xen/common/decompress.h
index 647b7b1e83db94232082b3161b388bd8b1825149..d740a80eeb5ccb3a22cb560aa9566203212d3a87 100644 (file)
--- a/xen/common/decompress.h
+++ b/xen/common/decompress.h
@@ -7,7 +7,7 @@
 #include <xen/types.h>
 #include <xen/xmalloc.h>
 
-#define STATIC
+#define STATIC static
 #define INIT __init
 #define INITDATA __initdata
 

diff --git a/xen/common/unlz4.c b/xen/common/unlz4.c
index 9dcaec7e84cca734c9f842c6294c4b744a324d02..4a8fc55ccb27089705b005b692bdfdc2bcba955e 100644 (file)
--- a/xen/common/unlz4.c
+++ b/xen/common/unlz4.c
@@ -22,12 +22,11 @@
 #define LZ4_DEFAULT_UNCOMPRESSED_CHUNK_SIZE (8 << 20)
 #define ARCHIVE_MAGICNUMBER 0x184C2102
 
-STATIC int INIT unlz4(unsigned char *input, unsigned int in_len,
-                     int (*fill)(void *, unsigned int),
-                     int (*flush)(void *, unsigned int),
-                     unsigned char *output,
-                     unsigned int *posp,
-                     void (*error)(const char *x))
+int INIT unlz4(unsigned char *input, unsigned int in_len,
+              int (*fill)(void *, unsigned int),
+              int (*flush)(void *, unsigned int),
+              unsigned char *output, unsigned int *posp,
+              void (*error)(const char *x))
 {
        int ret = -1;
        size_t chunksize = 0;

diff --git a/xen/common/unlzma.c b/xen/common/unlzma.c
index 9134277bba0368061ad99cf4145f68dfcca693f5..ea5ab41738ee235d06500babd510c433050125db 100644 (file)
--- a/xen/common/unlzma.c
+++ b/xen/common/unlzma.c
@@ -528,13 +528,11 @@ static inline int INIT process_bit1(struct writer *wr, struct rc *rc,
 
 
 
-STATIC int INIT unlzma(unsigned char *buf, unsigned int in_len,
-                      int(*fill)(void*, unsigned int),
-                      int(*flush)(void*, unsigned int),
-                      unsigned char *output,
-                      unsigned int *posp,
-                      void(*error)(const char *x)
-       )
+int INIT unlzma(unsigned char *buf, unsigned int in_len,
+               int(*fill)(void*, unsigned int),
+               int(*flush)(void*, unsigned int),
+               unsigned char *output, unsigned int *posp,
+               void(*error)(const char *x))
 {
        struct lzma_header header;
        int lc, pb, lp;

diff --git a/xen/common/unlzo.c b/xen/common/unlzo.c
index 11f64fcf3b26c4f0796e07b28b65263a1be95abb..df7e53db14a9babed3ca82aa705f7c285a94d109 100644 (file)
--- a/xen/common/unlzo.c
+++ b/xen/common/unlzo.c
@@ -114,11 +114,11 @@ static int INIT parse_header(u8 *input, int *skip, int in_len)
        return 1;
 }
 
-STATIC int INIT unlzo(u8 *input, unsigned int in_len,
-                     int (*fill) (void *, unsigned int),
-                     int (*flush) (void *, unsigned int),
-                     u8 *output, unsigned int *posp,
-                     void (*error) (const char *x))
+int INIT unlzo(unsigned char *input, unsigned int in_len,
+              int (*fill) (void *, unsigned int),
+              int (*flush) (void *, unsigned int),
+              unsigned char *output, unsigned int *posp,
+              void (*error) (const char *x))
 {
        u8 r = 0;
        int skip = 0;

diff --git a/xen/common/unxz.c b/xen/common/unxz.c
index cf25c9fc8ed00d1000653ec22a873653996aa7da..15806f4469f266e7d969bd93785db30302c95aa0 100644 (file)
--- a/xen/common/unxz.c
+++ b/xen/common/unxz.c
@@ -157,11 +157,11 @@
  * both input and output buffers are available as a single chunk, i.e. when
  * fill() and flush() won't be used.
  */
-STATIC int INIT unxz(unsigned char *in, unsigned int in_size,
-                    int (*fill)(void *dest, unsigned int size),
-                    int (*flush)(void *src, unsigned int size),
-                    unsigned char *out, unsigned int *in_used,
-                    void (*error)(const char *x))
+int INIT unxz(unsigned char *in, unsigned int in_size,
+             int (*fill)(void *dest, unsigned int size),
+             int (*flush)(void *src, unsigned int size),
+             unsigned char *out, unsigned int *in_used,
+             void (*error)(const char *x))
 {
        struct xz_buf b;
        struct xz_dec *s;

diff --git a/xen/common/unzstd.c b/xen/common/unzstd.c
index a10761642764573f5d856e81999b72116d160b77..915a07c21b19dff9a5f1f675c2f7d94fec584a4b 100644 (file)
--- a/xen/common/unzstd.c
+++ b/xen/common/unzstd.c
@@ -142,12 +142,11 @@ out:
        return err;
 }
 
-STATIC int INIT unzstd(unsigned char *in_buf, unsigned int in_len,
-                      int (*fill)(void*, unsigned int),
-                      int (*flush)(void*, unsigned int),
-                      unsigned char *out_buf,
-                      unsigned int *in_pos,
-                      void (*error)(const char *x))
+int INIT unzstd(unsigned char *in_buf, unsigned int in_len,
+               int (*fill)(void*, unsigned int),
+               int (*flush)(void*, unsigned int),
+               unsigned char *out_buf, unsigned int *in_pos,
+               void (*error)(const char *x))
 {
        ZSTD_inBuffer in;
        ZSTD_outBuffer out;