sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libsocketcan: Fix return value for get{set}_link() function 

This patch makes return value negative when open_nl_sock() function
fail and removes excess labels.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
pull/106/head^2
Alexander Shiyan 2014-02-03 13:40:21 +04:00 committed by Marc Kleine-Budde
parent 9a28d69183
commit 24500fcaca
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libsocketcan.c
View File

@ -508,20 +508,15 @@ static int do_get_nl_link(int fd, __u8 acquire, const char *name, void *res)
*/ */
static int get_link(const char *name, __u8 acquire, void *res) static int get_link(const char *name, __u8 acquire, void *res)
{ {
int fd; int err, fd;
int err = -1;
fd = open_nl_sock(); fd = open_nl_sock();
if (fd < 0) if (fd < 0)
goto err_out; return -1;
err = do_get_nl_link(fd, acquire, name, res); err = do_get_nl_link(fd, acquire, name, res);
if (err < 0)
goto close_out;
close_out:
close(fd); close(fd);
err_out:
return err; return err;
} }
@ -643,20 +638,15 @@ static int do_set_nl_link(int fd, __u8 if_state, const char *name,
*/ */
static int set_link(const char *name, __u8 if_state, struct req_info *req_info) static int set_link(const char *name, __u8 if_state, struct req_info *req_info)
{ {
int fd; int err, fd;
int err = 0;
fd = open_nl_sock(); fd = open_nl_sock();
if (fd < 0) if (fd < 0)
goto err_out; return -1;
err = do_set_nl_link(fd, if_state, name, req_info); err = do_set_nl_link(fd, if_state, name, req_info);
if (err < 0)
goto close_out;
close_out:
close(fd); close(fd);
err_out:
return err; return err;
} }