diff mbox series

[RFC,v5,002/126] net/net: Clean up variable shadowing in net_client_init()

Message ID 20191011160552.22907-3-vsementsov@virtuozzo.com
State New
Headers show
Series error: auto propagated local_err | expand

Commit Message

Vladimir Sementsov-Ogievskiy Oct. 11, 2019, 4:03 p.m. UTC 
Variable int err in inner scope shadows Error *err in outer scope.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 net/net.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

Comments

Philippe Mathieu-Daudé Oct. 12, 2019, 6:04 a.m. UTC | #1 
On 10/11/19 6:03 PM, Vladimir Sementsov-Ogievskiy wrote:
> Variable int err in inner scope shadows Error *err in outer scope.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>   net/net.c | 17 +++++++----------
>   1 file changed, 7 insertions(+), 10 deletions(-)
> 
> diff --git a/net/net.c b/net/net.c
> index 84aa6d8d00..9e93c3f8a1 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -1126,16 +1126,13 @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)
>   
>               prefix_addr = substrings[0];
>   
> -            if (substrings[1]) {
> -                /* User-specified prefix length.  */
> -                int err;
> -
> -                err = qemu_strtoul(substrings[1], NULL, 10, &prefix_len);
> -                if (err) {
> -                    error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
> -                               "ipv6-prefixlen", "a number");
> -                    goto out;
> -                }
> +            /* Handle user-specified prefix length. */
> +            if (substrings[1] &&
> +                qemu_strtoul(substrings[1], NULL, 10, &prefix_len))
> +            {
> +                error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
> +                           "ipv6-prefixlen", "a number");
> +                goto out;
>               }
>   
>               qemu_opt_set(opts, "ipv6-prefix", prefix_addr, &error_abort);
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff mbox series

Patch

diff --git a/net/net.c b/net/net.c
index 84aa6d8d00..9e93c3f8a1 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1126,16 +1126,13 @@  static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)
 
             prefix_addr = substrings[0];
 
-            if (substrings[1]) {
-                /* User-specified prefix length.  */
-                int err;
-
-                err = qemu_strtoul(substrings[1], NULL, 10, &prefix_len);
-                if (err) {
-                    error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-                               "ipv6-prefixlen", "a number");
-                    goto out;
-                }
+            /* Handle user-specified prefix length. */
+            if (substrings[1] &&
+                qemu_strtoul(substrings[1], NULL, 10, &prefix_len))
+            {
+                error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
+                           "ipv6-prefixlen", "a number");
+                goto out;
             }
 
             qemu_opt_set(opts, "ipv6-prefix", prefix_addr, &error_abort);