From: John Crispin <john@openwrt.org>
Date: Fri, 27 Dec 2013 21:15:20 +0000 (+0000)
Subject: swconfig: remove useless variables, return -1 on errors
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d1156bca0a2e3981aad62d6cc9155f71c01c3915;p=openwrt%2Fstaging%2Fmans0n.git

swconfig: remove useless variables, return -1 on errors

spotted with cppcheck

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>

SVN-Revision: 39170
---

diff --git a/package/network/config/swconfig/src/cli.c b/package/network/config/swconfig/src/cli.c
index 2eb73bea38..fa3dfdf6f2 100644
--- a/package/network/config/swconfig/src/cli.c
+++ b/package/network/config/swconfig/src/cli.c
@@ -178,7 +178,6 @@ swconfig_load_uci(struct switch_dev *dev, const char *name)
 {
 	struct uci_context *ctx;
 	struct uci_package *p = NULL;
-	struct uci_element *e;
 	int ret = -1;
 
 	ctx = uci_alloc_context();
@@ -206,7 +205,6 @@ int main(int argc, char **argv)
 	struct switch_dev *dev;
 	struct switch_attr *a;
 	struct switch_val val;
-	int err;
 	int i;
 
 	int cmd = CMD_NONE;
@@ -289,6 +287,7 @@ int main(int argc, char **argv)
 		if(!a)
 		{
 			fprintf(stderr, "Unknown attribute \"%s\"\n", ckey);
+			retval = -1;
 			goto out;
 		}
 	}
@@ -351,5 +350,5 @@ int main(int argc, char **argv)
 
 out:
 	swlib_free_all(dev);
-	return 0;
+	return retval;
 }
diff --git a/package/network/config/swconfig/src/swlib.c b/package/network/config/swconfig/src/swlib.c
index 7de3a604e0..122250256d 100644
--- a/package/network/config/swconfig/src/swlib.c
+++ b/package/network/config/swconfig/src/swlib.c
@@ -206,7 +206,6 @@ store_val(struct nl_msg *msg, void *arg)
 {
 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
 	struct switch_val *val = arg;
-	struct switch_attr *attr = val->attr;
 
 	if (!val)
 		goto error;
@@ -669,11 +668,7 @@ done:
 static int
 list_switch(struct nl_msg *msg, void *arg)
 {
-	struct swlib_scan_arg *sa = arg;
 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
-	struct switch_dev *dev;
-	const char *name;
-	const char *alias;
 
 	if (nla_parse(tb, SWITCH_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
 		goto done;
@@ -729,7 +724,6 @@ struct switch_dev *
 swlib_connect(const char *name)
 {
 	struct swlib_scan_arg arg;
-	int err;
 
 	if (!refcount) {
 		if (swlib_priv_init() < 0)
diff --git a/package/network/config/swconfig/src/uci.c b/package/network/config/swconfig/src/uci.c
index 893e3d1dd8..bbeeb03111 100644
--- a/package/network/config/swconfig/src/uci.c
+++ b/package/network/config/swconfig/src/uci.c
@@ -66,7 +66,6 @@ swlib_map_settings(struct switch_dev *dev, int type, int port_vlan, struct uci_s
 	struct switch_attr *attr;
 	struct uci_element *e;
 	struct uci_option *o;
-	int i;
 
 	uci_foreach_element(&s->options, e) {
 		o = uci_to_option(e);
@@ -109,7 +108,6 @@ skip:
 int swlib_apply_from_uci(struct switch_dev *dev, struct uci_package *p)
 {
 	struct switch_attr *attr;
-	struct uci_context *ctx = p->ctx;
 	struct uci_element *e;
 	struct uci_section *s;
 	struct uci_option *o;