From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, qemu-arm@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH v2 16/22] crypto/cipher-gnutls.c: Clean up local variable shadowing
Date: Mon, 4 Sep 2023 18:12:28 +0200 [thread overview]
Message-ID: <20230904161235.84651-17-philmd@linaro.org> (raw)
In-Reply-To: <20230904161235.84651-1-philmd@linaro.org>
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(-)
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));
--
2.41.0
next prev parent reply other threads:[~2023-09-04 16:18 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-04 16:12 [PATCH v2 00/22] (few more) Steps towards enabling -Wshadow Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 01/22] tcg: Clean up local variable shadowing Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 02/22] target/arm/tcg: " Philippe Mathieu-Daudé
2023-09-08 12:25 ` Peter Maydell
2023-09-04 16:12 ` [PATCH v2 03/22] target/arm/hvf: " Philippe Mathieu-Daudé
2023-09-08 12:26 ` Peter Maydell
2023-09-04 16:12 ` [PATCH v2 04/22] target/mips: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 05/22] target/m68k: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 06/22] target/tricore: " Philippe Mathieu-Daudé
2023-09-05 5:34 ` Bastian Koppelmann
2023-09-04 16:12 ` [PATCH v2 07/22] hw/arm/armv7m: " Philippe Mathieu-Daudé
2023-09-08 12:29 ` Peter Maydell
2023-09-04 16:12 ` [PATCH v2 08/22] hw/arm/virt: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 09/22] hw/arm/allwinner: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 10/22] hw/arm/aspeed: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 11/22] hw/ide/ahci: " Philippe Mathieu-Daudé
2023-09-29 5:07 ` Markus Armbruster
2023-09-04 16:12 ` [PATCH v2 12/22] hw/m68k: " Philippe Mathieu-Daudé
2023-09-26 16:28 ` Thomas Huth
2023-09-04 16:12 ` [PATCH v2 13/22] hw/microblaze: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 14/22] hw/nios2: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 15/22] net/eth: " Philippe Mathieu-Daudé
2023-09-08 13:18 ` Eric Blake
2023-09-10 4:20 ` Akihiko Odaki
2023-09-04 16:12 ` Philippe Mathieu-Daudé [this message]
2023-09-04 16:27 ` [PATCH v2 16/22] crypto/cipher-gnutls.c: " Daniel P. Berrangé
2023-09-04 16:29 ` Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 17/22] util/vhost-user-server: " Philippe Mathieu-Daudé
2023-09-22 10:23 ` Michael S. Tsirkin
2023-09-04 16:12 ` [PATCH v2 18/22] semihosting/arm-compat: " Philippe Mathieu-Daudé
2023-09-08 12:36 ` Peter Maydell
2023-10-04 9:41 ` Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 19/22] linux-user/strace: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 20/22] sysemu/device_tree: " Philippe Mathieu-Daudé
2023-09-29 4:58 ` Markus Armbruster
2023-09-04 16:12 ` [PATCH v2 21/22] softmmu/memory: " Philippe Mathieu-Daudé
2023-09-05 15:46 ` Peter Xu
2023-09-04 16:12 ` [RFC PATCH v2 22/22] softmmu/physmem: " Philippe Mathieu-Daudé
2023-09-04 16:31 ` Daniel P. Berrangé
2023-09-05 15:50 ` Peter Xu
2023-09-29 5:13 ` [PATCH v2 00/22] (few more) Steps towards enabling -Wshadow Markus Armbruster
2023-09-29 6:42 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230904161235.84651-17-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).