KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

swconfig: remove useless variables, return -1 on errors

Browse source 
spotted with cppcheck

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

SVN-Revision: 39170
This commit is contained in:
John Crispin 2013-12-27 21:15:20 +00:00
parent 834204bda6
commit d1156bca0a
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/network/config/swconfig/src/cli.c
View file

@ -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;
}

6
package/network/config/swconfig/src/swlib.c
View file

@ -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)

2
package/network/config/swconfig/src/uci.c
View file

@ -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;