[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 03/25] net/net: fix local variable shadowing in net_client_ini
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v3 03/25] net/net: fix local variable shadowing in net_client_init |
Date: |
Tue, 24 Sep 2019 23:08:40 +0300 |
Don't shadow Error *err: it's a bad thing.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
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
- [PATCH v3 00/25] error: auto propagated local_err, Vladimir Sementsov-Ogievskiy, 2019/09/24
- [PATCH v3 03/25] net/net: fix local variable shadowing in net_client_init,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v3 05/25] scripts: add coccinelle script to fix error_append_hint usage, Vladimir Sementsov-Ogievskiy, 2019/09/24
- [PATCH v3 07/25] s390: Fix error_append_hint usage, Vladimir Sementsov-Ogievskiy, 2019/09/24
- [PATCH v3 08/25] ARM TCG CPUs: Fix error_append_hint usage, Vladimir Sementsov-Ogievskiy, 2019/09/24
- [PATCH v3 06/25] python: add commit-per-subsystem.py, Vladimir Sementsov-Ogievskiy, 2019/09/24
- [PATCH v3 09/25] PowerPC TCG CPUs: Fix error_append_hint usage, Vladimir Sementsov-Ogievskiy, 2019/09/24
- [PATCH v3 10/25] arm: Fix error_append_hint usage, Vladimir Sementsov-Ogievskiy, 2019/09/24