[PATCH 0/2] remove some variable shadowing

[PATCH 0/2] remove some variable shadowing

[Daniel P. Berrangé]

Daniel P. Berrangé (2):
  crypto: remove shadowed 'ret' variable
  seccomp: avoid shadowing of 'action' variable

 crypto/tls-cipher-suites.c | 1 -
 softmmu/qemu-seccomp.c     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

-- 
2.41.0

[PATCH 1/2] crypto: remove shadowed 'ret' variable

[Daniel P. Berrangé]

Both instances of 'ret' are used to store a gnutls API return code.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 crypto/tls-cipher-suites.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c
index 5e4f597464..d0df4badc0 100644
--- a/crypto/tls-cipher-suites.c
+++ b/crypto/tls-cipher-suites.c
@@ -52,7 +52,6 @@ GByteArray *qcrypto_tls_cipher_suites_get_data(QCryptoTLSCipherSuites *obj,
     byte_array = g_byte_array_new();
 
     for (i = 0;; i++) {
-        int ret;
         unsigned idx;
         const char *name;
         IANA_TLS_CIPHER cipher;
-- 
2.41.0

[PATCH 2/2] seccomp: avoid shadowing of 'action' variable

[Daniel P. Berrangé]

This is confusing as one 'action' variable is used for storing
a SCMP_ enum value, while the other 'action' variable is used
for storing a SECCOMP_ enum value.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 softmmu/qemu-seccomp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c
index d66a2a1226..4d7439e7f7 100644
--- a/softmmu/qemu-seccomp.c
+++ b/softmmu/qemu-seccomp.c
@@ -283,9 +283,9 @@ static uint32_t qemu_seccomp_update_action(uint32_t action)
     if (action == SCMP_ACT_TRAP) {
         static int kill_process = -1;
         if (kill_process == -1) {
-            uint32_t action = SECCOMP_RET_KILL_PROCESS;
+            uint32_t testaction = SECCOMP_RET_KILL_PROCESS;
 
-            if (qemu_seccomp(SECCOMP_GET_ACTION_AVAIL, 0, &action) == 0) {
+            if (qemu_seccomp(SECCOMP_GET_ACTION_AVAIL, 0, &testaction) == 0) {
                 kill_process = 1;
             } else {
                 kill_process = 0;
-- 
2.41.0

Re: [PATCH 1/2] crypto: remove shadowed 'ret' variable

[Philippe Mathieu-Daudé]

On 22/9/23 18:06, Daniel P. Berrangé wrote:
> Both instances of 'ret' are used to store a gnutls API return code.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   crypto/tls-cipher-suites.c | 1 -
>   1 file changed, 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH 2/2] seccomp: avoid shadowing of 'action' variable

[Markus Armbruster]

Daniel P. Berrangé <berrange@redhat.com> writes:

> This is confusing as one 'action' variable is used for storing
> a SCMP_ enum value, while the other 'action' variable is used
> for storing a SECCOMP_ enum value.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  softmmu/qemu-seccomp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c
> index d66a2a1226..4d7439e7f7 100644
> --- a/softmmu/qemu-seccomp.c
> +++ b/softmmu/qemu-seccomp.c
> @@ -283,9 +283,9 @@ static uint32_t qemu_seccomp_update_action(uint32_t action)
>      if (action == SCMP_ACT_TRAP) {
>          static int kill_process = -1;
>          if (kill_process == -1) {
> -            uint32_t action = SECCOMP_RET_KILL_PROCESS;
> +            uint32_t testaction = SECCOMP_RET_KILL_PROCESS;
>  
> -            if (qemu_seccomp(SECCOMP_GET_ACTION_AVAIL, 0, &action) == 0) {
> +            if (qemu_seccomp(SECCOMP_GET_ACTION_AVAIL, 0, &testaction) == 0) {
>                  kill_process = 1;
>              } else {
>                  kill_process = 0;

I'd prefer @test_action.  Regardless:
Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [PATCH 0/2] remove some variable shadowing

[Markus Armbruster]

Queued, thanks!