[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 15/35] net/net: Clean up variable shadowing in net_client_init(
From: |
Markus Armbruster |
Subject: |
[PULL v2 15/35] net/net: Clean up variable shadowing in net_client_init() |
Date: |
Wed, 18 Dec 2019 09:17:01 +0100 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <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
- [PULL v2 11/35] memory-device: Fix memory pre-plug error API violations, (continued)
- [PULL v2 11/35] memory-device: Fix memory pre-plug error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 25/35] hw/i386/amd_iommu: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 19/35] qdev-monitor: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 22/35] 9pfs: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 13/35] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize(), Markus Armbruster, 2019/12/18
- [PULL v2 30/35] hw/tpm: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 27/35] monitor/qmp-cmds: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 26/35] qga: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 16/35] error: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 23/35] hw/core/qdev: cleanup Error ** variables, Markus Armbruster, 2019/12/18
- [PULL v2 15/35] net/net: Clean up variable shadowing in net_client_init(),
Markus Armbruster <=
- [PULL v2 31/35] hw/usb: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 24/35] block/snapshot: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 35/35] nbd: assert that Error** is not NULL in nbd_iter_channel_error, Markus Armbruster, 2019/12/18
- [PULL v2 29/35] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header, Markus Armbruster, 2019/12/18
- [PULL v2 32/35] include/qom/object.h: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 04/35] io: Fix Error usage in a comment <example>, Markus Armbruster, 2019/12/18
- [PULL v2 28/35] hw/s390x: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 33/35] backends/cryptodev: drop local_err from cryptodev_backend_complete(), Markus Armbruster, 2019/12/18
- [PULL v2 03/35] crypto: Fix typo in QCryptoTLSSession's <example> comment, Markus Armbruster, 2019/12/18
- [PULL v2 08/35] hw/core: Fix fit_load_fdt() error API violations, Markus Armbruster, 2019/12/18