diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2014-10-22 16:34:30 +0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-10-23 13:15:30 +0300 |
| commit | ca7458bc895dd8d9c90fd28bf27a28f0f2e26c65 (patch) | |
| tree | 3158f9b777b8686d7f71b131b226b2944bf68979 /profiles/network | |
| parent | 28f4a00f41c47ec2a211b07c47131e6284dcf466 (diff) | |
| download | bluez-ca7458bc895dd8d9c90fd28bf27a28f0f2e26c65.tar.gz | |
bnep: Return errno instead of -1 and print error
Make code consistent with the rest returning -errno and printing error
message.
Diffstat (limited to 'profiles/network')
| -rw-r--r-- | profiles/network/bnep.c | 16 |
1 files 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, |