diff options
Diffstat (limited to 'src/socket.c')
| -rw-r--r-- | src/socket.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/socket.c b/src/socket.c index 917ade1..644d49f 100644 --- a/src/socket.c +++ b/src/socket.c @@ -11,6 +11,7 @@ #include "utils.h" static int socket_setopts(int sockfd); +static inline void socket_freeaddr(struct addrinfo **results); static int socket_setopts(int sockfd) @@ -31,6 +32,14 @@ static int socket_setopts(int sockfd) return 0; } +static inline void socket_freeaddr(struct addrinfo **results) +{ + if (*results) { + freeaddrinfo(*results); + *results = NULL; + } +} + int socket_nonblock(const psocket *psock) { return set_fd_nonblock(psock->fd); @@ -50,10 +59,8 @@ int socket_init_in(const char *addr, hints.ai_flags = AI_PASSIVE; /* all interfaces */ s = getaddrinfo(addr, port, &hints, results); - if (s) { - freeaddrinfo(*results); - *results = NULL; - } + if (s) + socket_freeaddr(results); return s; } @@ -92,8 +99,7 @@ int socket_bind_in(psocket *psock, struct addrinfo **results) s = socket_nonblock(psock); finalise: - freeaddrinfo(*results); - *results = NULL; + socket_freeaddr(results); return s; } @@ -160,8 +166,7 @@ int socket_connect_in(psocket *psock, struct addrinfo **results) s = socket_nonblock(psock); finalise: - freeaddrinfo(*results); - *results = NULL; + socket_freeaddr(results); return s; } |