[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/56] crypto/cipher-gnutls.c: Clean up local variable shadowing
From: |
Markus Armbruster |
Subject: |
[PULL 21/56] crypto/cipher-gnutls.c: Clean up local variable shadowing |
Date: |
Fri, 29 Sep 2023 10:50:18 +0200 |
From: Philippe Mathieu-Daudé <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>
Message-ID: <20230904161235.84651-17-philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
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
- [PULL 12/56] target/m68k: Clean up local variable shadowing, (continued)
- [PULL 12/56] target/m68k: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 34/56] spapr/drc: Clean up local variable shadowing in rtas_ibm_configure_connector(), Markus Armbruster, 2023/09/29
- [PULL 38/56] hw/acpi: changes towards enabling -Wshadow=local, Markus Armbruster, 2023/09/29
- [PULL 32/56] spapr: Clean up local variable shadowing in spapr_init_cpus(), Markus Armbruster, 2023/09/29
- [PULL 23/56] linux-user/strace: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 13/56] target/tricore: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 17/56] hw/m68k: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 25/56] softmmu/memory: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 26/56] softmmu/physmem: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 41/56] hw/arm/smmuv3.c: Avoid shadowing variable, Markus Armbruster, 2023/09/29
- [PULL 21/56] crypto/cipher-gnutls.c: Clean up local variable shadowing,
Markus Armbruster <=
- [PULL 29/56] hw/ppc: Clean up local variable shadowing in _FDT helper routine, Markus Armbruster, 2023/09/29
- [PULL 16/56] hw/arm/allwinner: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 20/56] net/eth: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 10/56] target/arm/hvf: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 39/56] hw/intc/arm_gicv3_its: Avoid shadowing variable in do_process_its_cmd(), Markus Armbruster, 2023/09/29
- [PULL 33/56] spapr: Clean up local variable shadowing in spapr_get_fw_dev_path(), Markus Armbruster, 2023/09/29
- [PULL 36/56] spapr/drc: Clean up local variable shadowing in prop_get_fdt(), Markus Armbruster, 2023/09/29
- [PULL 24/56] sysemu/device_tree: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 27/56] hw/core/machine: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 44/56] aspeed: Clean up local variable shadowing, Markus Armbruster, 2023/09/29