[PATCH RFC] libsocketcan: Fix return value for get{set}_link() function

[PATCH RFC] libsocketcan: Fix return value for get{set}_link() function

[Alexander Shiyan]

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>
---
 src/libsocketcan.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/libsocketcan.c b/src/libsocketcan.c
index 7a523d2..02714ae 100644
--- a/src/libsocketcan.c
+++ b/src/libsocketcan.c
@@ -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)
 {
-	int fd;
-	int err = -1;
+	int err, fd;
 
 	fd = open_nl_sock();
 	if (fd < 0)
-		goto err_out;
+		return -1;
 
 	err = do_get_nl_link(fd, acquire, name, res);
-	if (err < 0)
-		goto close_out;
-
-close_out:
 	close(fd);
-err_out:
+
 	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)
 {
-	int fd;
-	int err = 0;
+	int err, fd;
 
 	fd = open_nl_sock();
 	if (fd < 0)
-		goto err_out;
+		return -1;
 
 	err = do_set_nl_link(fd, if_state, name, req_info);
-	if (err < 0)
-		goto close_out;
-
-close_out:
 	close(fd);
-err_out:
+
 	return err;
 }
 
-- 
1.8.3.2

Re: [PATCH RFC] libsocketcan: Fix return value for get{set}_link() function

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 516 bytes --]

On 02/03/2014 10:40 AM, Alexander Shiyan wrote:
> 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>

Applied.

Tnx,
Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]