From 12abcb36c871f4c97d7aed3d9bd55e5477888bb7 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 10 Dec 2008 14:14:09 +0000 Subject: libiproute: fix buggy open check: s/if (fd)/if (fd >= 0)/ less: small optimization -15 bytes --- miscutils/less.c | 4 +--- networking/libiproute/ll_map.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/miscutils/less.c b/miscutils/less.c index 36d451271..27855bbe8 100644 --- a/miscutils/less.c +++ b/miscutils/less.c @@ -774,9 +774,7 @@ static void buffer_line(int linenum) static void open_file_and_read_lines(void) { if (filename) { - int fd = xopen(filename, O_RDONLY); - dup2(fd, 0); - if (fd) close(fd); + xmove_fd(xopen(filename, O_RDONLY), STDIN_FILENO); } else { /* "less" with no arguments in argv[] */ /* For status line only */ diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index 3412dc763..2ed7fbbb3 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c @@ -172,7 +172,7 @@ int xll_name_to_index(const char *const name) #endif sock_fd = socket(AF_INET, SOCK_DGRAM, 0); - if (sock_fd) { + if (sock_fd >= 0) { struct ifreq ifr; int tmp; -- cgit v1.2.3