[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 02/21] net/net: Clean up variable shadowing in net_client_init
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v7 02/21] net/net: Clean up variable shadowing in net_client_init() |
Date: |
Thu, 5 Dec 2019 18:20:00 +0300 |
Variable int err in inner scope shadows Error *err in outer scope.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <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 v7 00/21] error: prepare for auto propagated local_err, Vladimir Sementsov-Ogievskiy, 2019/12/05
- [PATCH v7 02/21] net/net: Clean up variable shadowing in net_client_init(),
Vladimir Sementsov-Ogievskiy <=
- [PATCH v7 05/21] vnc: drop Error pointer indirection in vnc_client_io_error, Vladimir Sementsov-Ogievskiy, 2019/12/05
- [PATCH v7 16/21] hw/tpm: rename Error ** parameter to more common errp, Vladimir Sementsov-Ogievskiy, 2019/12/05
- [PATCH v7 03/21] error: rename errp to errp_in where it is IN-argument, Vladimir Sementsov-Ogievskiy, 2019/12/05
- [PATCH v7 01/21] hw/core/loader-fit: fix freeing errp in fit_load_fdt, Vladimir Sementsov-Ogievskiy, 2019/12/05
- [PATCH v7 19/21] backends/cryptodev: drop local_err from cryptodev_backend_complete(), Vladimir Sementsov-Ogievskiy, 2019/12/05
- [PATCH v7 13/21] monitor/qmp-cmds: rename Error ** parameter to more common errp, Vladimir Sementsov-Ogievskiy, 2019/12/05
- [PATCH v7 06/21] qdev-monitor: well form error hint helpers, Vladimir Sementsov-Ogievskiy, 2019/12/05