| Message ID | 20230904161235.84651-17-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | (few more) Steps towards enabling -Wshadow | expand |
On Mon, Sep 04, 2023 at 06:12:28PM +0200, Philippe Mathieu-Daudé wrote: > Fix: > > In file included from crypto/cipher.c:140: > crypto/cipher-gnutls.c.inc: In function ‘qcrypto_gnutls_cipher_encrypt’: > crypto/cipher-gnutls.c.inc:116:17: warning: declaration of ‘err’ shadows a previous local [-Wshadow=compatible-local] > 116 | int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); > | ^~~ > crypto/cipher-gnutls.c.inc:94:9: note: shadowed declaration is here > 94 | int err; > | ^~~ > --- > > crypto/cipher-gnutls.c.inc: In function ‘qcrypto_gnutls_cipher_decrypt’: > crypto/cipher-gnutls.c.inc:177:17: warning: declaration of ‘err’ shadows a previous local [-Wshadow=compatible-local] > 177 | int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); > | ^~~ > crypto/cipher-gnutls.c.inc:154:9: note: shadowed declaration is here > 154 | int err; > | ^~~ > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > crypto/cipher-gnutls.c.inc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> and if you want to include it in general pull request Acked-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
On 4/9/23 18:27, Daniel P. Berrangé wrote: > On Mon, Sep 04, 2023 at 06:12:28PM +0200, Philippe Mathieu-Daudé wrote: >> Fix: >> >> In file included from crypto/cipher.c:140: >> crypto/cipher-gnutls.c.inc: In function ‘qcrypto_gnutls_cipher_encrypt’: >> crypto/cipher-gnutls.c.inc:116:17: warning: declaration of ‘err’ shadows a previous local [-Wshadow=compatible-local] >> 116 | int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); >> | ^~~ >> crypto/cipher-gnutls.c.inc:94:9: note: shadowed declaration is here >> 94 | int err; >> | ^~~ >> --- >> >> crypto/cipher-gnutls.c.inc: In function ‘qcrypto_gnutls_cipher_decrypt’: >> crypto/cipher-gnutls.c.inc:177:17: warning: declaration of ‘err’ shadows a previous local [-Wshadow=compatible-local] >> 177 | int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); >> | ^~~ >> crypto/cipher-gnutls.c.inc:154:9: note: shadowed declaration is here >> 154 | int err; >> | ^~~ >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> crypto/cipher-gnutls.c.inc | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > and if you want to include it in general pull request Sure, > Acked-by: Daniel P. Berrangé <berrange@redhat.com> Thank you!
diff --git a/crypto/cipher-gnutls.c.inc b/crypto/cipher-gnutls.c.inc index 501e4e07a5..d3e231c13c 100644 --- a/crypto/cipher-gnutls.c.inc +++ b/crypto/cipher-gnutls.c.inc @@ -113,7 +113,7 @@ qcrypto_gnutls_cipher_encrypt(QCryptoCipher *cipher, while (len) { gnutls_cipher_hd_t handle; gnutls_datum_t gkey = { (unsigned char *)ctx->key, ctx->nkey }; - int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); + err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); if (err != 0) { error_setg(errp, "Cannot initialize cipher: %s", gnutls_strerror(err)); @@ -174,7 +174,7 @@ qcrypto_gnutls_cipher_decrypt(QCryptoCipher *cipher, while (len) { gnutls_cipher_hd_t handle; gnutls_datum_t gkey = { (unsigned char *)ctx->key, ctx->nkey }; - int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); + err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); if (err != 0) { error_setg(errp, "Cannot initialize cipher: %s", gnutls_strerror(err));
Fix: In file included from crypto/cipher.c:140: crypto/cipher-gnutls.c.inc: In function ‘qcrypto_gnutls_cipher_encrypt’: crypto/cipher-gnutls.c.inc:116:17: warning: declaration of ‘err’ shadows a previous local [-Wshadow=compatible-local] 116 | int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); | ^~~ crypto/cipher-gnutls.c.inc:94:9: note: shadowed declaration is here 94 | int err; | ^~~ --- crypto/cipher-gnutls.c.inc: In function ‘qcrypto_gnutls_cipher_decrypt’: crypto/cipher-gnutls.c.inc:177:17: warning: declaration of ‘err’ shadows a previous local [-Wshadow=compatible-local] 177 | int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, NULL); | ^~~ crypto/cipher-gnutls.c.inc:154:9: note: shadowed declaration is here 154 | int err; | ^~~ Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- crypto/cipher-gnutls.c.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)