From d590eceab74772a8d5fa50c94074b09927577ee4 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Wed, 25 Dec 2019 11:01:25 -0800
Subject: Various clang tidy fixups in the POSIX pollers.

---
 src/platform/posix/posix_ipcdial.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/platform/posix/posix_ipcdial.c')

diff --git a/src/platform/posix/posix_ipcdial.c b/src/platform/posix/posix_ipcdial.c
index 3182b390..3ce8c401 100644
--- a/src/platform/posix/posix_ipcdial.c
+++ b/src/platform/posix/posix_ipcdial.c
@@ -11,16 +11,10 @@
 
 #include "core/nng_impl.h"
 
-#include <arpa/inet.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/uio.h>
 #include <unistd.h>
 
 #ifndef SOCK_CLOEXEC
@@ -86,7 +80,7 @@ ipc_dialer_cancel(nni_aio *aio, void *arg, int rv)
 }
 
 static void
-ipc_dialer_cb(nni_posix_pfd *pfd, int ev, void *arg)
+ipc_dialer_cb(nni_posix_pfd *pfd, unsigned ev, void *arg)
 {
 	nni_ipc_conn *  c = arg;
 	nni_ipc_dialer *d = c->dialer;
@@ -100,7 +94,7 @@ ipc_dialer_cb(nni_posix_pfd *pfd, int ev, void *arg)
 		return;
 	}
 
-	if (ev & POLLNVAL) {
+	if ((ev & NNI_POLL_INVAL) != 0) {
 		rv = EBADF;
 
 	} else {
@@ -187,7 +181,7 @@ ipc_dialer_dial(void *arg, nni_aio *aio)
 	if ((rv = nni_aio_schedule(aio, ipc_dialer_cancel, d)) != 0) {
 		goto error;
 	}
-	if ((rv = connect(fd, (void *) &ss, sslen)) != 0) {
+	if (connect(fd, (void *) &ss, sslen) != 0) {
 		if (errno != EINPROGRESS) {
 			if (errno == ENOENT) {
 				// No socket present means nobody listening.
@@ -198,7 +192,7 @@ ipc_dialer_dial(void *arg, nni_aio *aio)
 			goto error;
 		}
 		// Asynchronous connect.
-		if ((rv = nni_posix_pfd_arm(pfd, POLLOUT)) != 0) {
+		if ((rv = nni_posix_pfd_arm(pfd, NNI_POLL_OUT)) != 0) {
 			goto error;
 		}
 		c->dial_aio = aio;
-- 
cgit v1.2.3-70-g09d2