* [PATCH v6] net/net: Clean up variable shadowing in net_client_init()
@ 2019-11-27 18:32 Vladimir Sementsov-Ogievskiy
0 siblings, 0 replies; only message in thread
From: Vladimir Sementsov-Ogievskiy @ 2019-11-27 18:32 UTC (permalink / raw)
To: qemu-devel; +Cc: philmd, jasowang, vsementsov
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v6: add Philippe's r-b
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);
--
2.21.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-11-27 18:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-27 18:32 [PATCH v6] net/net: Clean up variable shadowing in net_client_init() Vladimir Sementsov-Ogievskiy
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).