crypto: pcomp - Constify (de)compression parameters

In testmgr, struct pcomp_testvec takes a non-const 'params' field, which is
pointed to a const deflate_comp_params or deflate_decomp_params object.  With
gcc-5 this incurs the following warnings:

In file included from ../crypto/testmgr.c:44:0:
../crypto/testmgr.h:28736:13: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-array-qualifiers]
   .params = &deflate_comp_params,
             ^
../crypto/testmgr.h:28748:13: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-array-qualifiers]
   .params = &deflate_comp_params,
             ^
../crypto/testmgr.h:28776:13: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-array-qualifiers]
   .params = &deflate_decomp_params,
             ^
../crypto/testmgr.h:28800:13: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-array-qualifiers]
   .params = &deflate_decomp_params,
             ^

Fix this by making the parameters pointer const and constifying the things
that use it.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index 62e2485bb428c03de6d8b1e6c546fc825a95fcb7..1f5a31f23a59a678ad7b2c8f2e888478d3b3df04 100644 (file)
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -28591,7 +28591,7 @@ struct comp_testvec {
 };
 
 struct pcomp_testvec {
-       void *params;
+       const void *params;
        unsigned int paramsize;
        int inlen, outlen;
        char input[COMP_BUF_SIZE];

diff --git a/crypto/zlib.c b/crypto/zlib.c
index 0eefa9d237ace7f3b607bbfcc4f657580eaa60a0..d51a30a29e421fe6a80af8d0ce0ec78b048fe5e5 100644 (file)
--- a/crypto/zlib.c
+++ b/crypto/zlib.c
@@ -78,7 +78,7 @@ static void zlib_exit(struct crypto_tfm *tfm)
 }
 
 
-static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
+static int zlib_compress_setup(struct crypto_pcomp *tfm, const void *params,
                               unsigned int len)
 {
        struct zlib_ctx *ctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
@@ -209,7 +209,7 @@ static int zlib_compress_final(struct crypto_pcomp *tfm,
 }
 
 
-static int zlib_decompress_setup(struct crypto_pcomp *tfm, void *params,
+static int zlib_decompress_setup(struct crypto_pcomp *tfm, const void *params,
                                 unsigned int len)
 {
        struct zlib_ctx *ctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));

diff --git a/include/crypto/compress.h b/include/crypto/compress.h
index 86163ef24219874a0a96640de84686105f2529fb..5b67af834d836eae2a6e74740f9862e0d399145b 100644 (file)
--- a/include/crypto/compress.h
+++ b/include/crypto/compress.h
@@ -55,14 +55,14 @@ struct crypto_pcomp {
 };
 
 struct pcomp_alg {
-       int (*compress_setup)(struct crypto_pcomp *tfm, void *params,
+       int (*compress_setup)(struct crypto_pcomp *tfm, const void *params,
                              unsigned int len);
        int (*compress_init)(struct crypto_pcomp *tfm);
        int (*compress_update)(struct crypto_pcomp *tfm,
                               struct comp_request *req);
        int (*compress_final)(struct crypto_pcomp *tfm,
                              struct comp_request *req);
-       int (*decompress_setup)(struct crypto_pcomp *tfm, void *params,
+       int (*decompress_setup)(struct crypto_pcomp *tfm, const void *params,
                                unsigned int len);
        int (*decompress_init)(struct crypto_pcomp *tfm);
        int (*decompress_update)(struct crypto_pcomp *tfm,
@@ -97,7 +97,7 @@ static inline struct pcomp_alg *crypto_pcomp_alg(struct crypto_pcomp *tfm)
 }
 
 static inline int crypto_compress_setup(struct crypto_pcomp *tfm,
-                                       void *params, unsigned int len)
+                                       const void *params, unsigned int len)
 {
        return crypto_pcomp_alg(tfm)->compress_setup(tfm, params, len);
 }
@@ -120,7 +120,7 @@ static inline int crypto_compress_final(struct crypto_pcomp *tfm,
 }
 
 static inline int crypto_decompress_setup(struct crypto_pcomp *tfm,
-                                         void *params, unsigned int len)
+                                         const void *params, unsigned int len)
 {
        return crypto_pcomp_alg(tfm)->decompress_setup(tfm, params, len);
 }