From 29cf9f85a262d99b868007ebb9fdd67d91ea1c63 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 5 May 2015 14:24:47 -0400 Subject: [PATCH] remove redundant code --- daemon/graphite.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/daemon/graphite.c b/daemon/graphite.c index 14fcd1bb1..7e64e6ea2 100644 --- a/daemon/graphite.c +++ b/daemon/graphite.c @@ -33,27 +33,6 @@ void set_prefix(char* prefix) { graphite_prefix = prefix; } -/** - * Set a file descriptor to blocking or non-blocking mode. - * - * @param fd The file descriptor - * @param blocking 0:non-blocking mode, 1:blocking mode - * - * @return 1:success, 0:failure. - **/ -int fd_set_blocking(int fd, int blocking) { - /* Save the current flags */ - int flags = fcntl(fd, F_GETFL, 0); - if (flags == -1) - return 0; - - if (blocking) - flags &= ~O_NONBLOCK; - else - flags |= O_NONBLOCK; - return fcntl(fd, F_SETFL, flags) != -1; -} - int connect_to_graphite_server(u_int32_t ipaddress, int port) { if (graphite_sock>0) @@ -85,11 +64,7 @@ int connect_to_graphite_server(u_int32_t ipaddress, int port) { goto error; } - rc = fd_set_blocking(graphite_sock,0); - if (!rc) { - ilog(LOG_ERROR,"Could not set the socket to nonblocking."); - goto error; - } + nonblock(graphite_sock); struct in_addr ip; ip.s_addr = graphite_ipaddress;