From ca7458bc895dd8d9c90fd28bf27a28f0f2e26c65 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Wed, 22 Oct 2014 16:34:30 +0300 Subject: [PATCH] bnep: Return errno instead of -1 and print error Make code consistent with the rest returning -errno and printing error message. --- profiles/network/bnep.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/profiles/network/bnep.c b/profiles/network/bnep.c index d8883d68e..09d4b65c5 100644 --- a/profiles/network/bnep.c +++ b/profiles/network/bnep.c @@ -520,7 +520,7 @@ static int bnep_del_from_bridge(const char *devname, const char *bridge) { int ifindex; struct ifreq ifr; - int sk, err; + int sk, err = 0; if (!devname || !bridge) return -EINVAL; @@ -535,16 +535,16 @@ static int bnep_del_from_bridge(const char *devname, const char *bridge) strncpy(ifr.ifr_name, bridge, IFNAMSIZ - 1); ifr.ifr_ifindex = ifindex; - err = ioctl(sk, SIOCBRDELIF, &ifr); + if (ioctl(sk, SIOCBRDELIF, &ifr) < 0) { + err = -errno; + error("bnep: Can't delete %s from the bridge %s: %s(%d)", + devname, bridge, strerror(-err), -err); + } else + info("bridge %s: interface %s removed", bridge, devname); close(sk); - if (err < 0) - return err; - - info("bridge %s: interface %s removed", bridge, devname); - - return 0; + return err; } int bnep_server_add(int sk, uint16_t dst, char *bridge, char *iface, -- 2.47.3