Give up on uncrustify; switch to clang-format.

1 files changed, 29 insertions, 80 deletions

diff --git a/src/nng.c b/src/nng.c
index 59c003a7..e66a3ddc 100644
--- a/src/nng.c
+++ b/src/nng.c
@@ -23,7 +23,7 @@
 int
 nng_open(nng_socket *sidp, uint16_t proto)
 {
-	int rv;
+	int       rv;
 	nni_sock *sock;
 
 	if ((rv = nni_sock_open(&sock, proto)) != 0) {
@@ -36,18 +36,16 @@ nng_open(nng_socket *sidp, uint16_t proto)
 	return (0);
 }
 
-
 void
 nng_fini(void)
 {
 	nni_fini();
 }
 
-
 int
 nng_shutdown(nng_socket sid)
 {
-	int rv;
+	int       rv;
 	nni_sock *sock;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
@@ -58,11 +56,10 @@ nng_shutdown(nng_socket sid)
 	return (rv);
 }
 
-
 int
 nng_close(nng_socket sid)
 {
-	int rv;
+	int       rv;
 	nni_sock *sock;
 
 	// Close is special, because we still want to be able to get
@@ -75,12 +72,11 @@ nng_close(nng_socket sid)
 	return (rv);
 }
 
-
 uint16_t
 nng_protocol(nng_socket sid)
 {
-	int rv;
-	uint16_t pnum;
+	int       rv;
+	uint16_t  pnum;
 	nni_sock *sock;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
@@ -91,12 +87,11 @@ nng_protocol(nng_socket sid)
 	return (pnum);
 }
 
-
 uint16_t
 nng_peer(nng_socket sid)
 {
-	int rv;
-	uint16_t pnum;
+	int       rv;
+	uint16_t  pnum;
 	nni_sock *sock;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
@@ -107,12 +102,11 @@ nng_peer(nng_socket sid)
 	return (pnum);
 }
 
-
 int
 nng_recv(nng_socket sid, void *buf, size_t *szp, int flags)
 {
 	nng_msg *msg;
-	int rv;
+	int      rv;
 
 	// Note that while it would be nice to make this a zero copy operation,
 	// its not normally possible if a size was specified.
@@ -144,12 +138,11 @@ nng_recv(nng_socket sid, void *buf, size_t *szp, int flags)
 	return (0);
 }
 
-
 int
 nng_recvmsg(nng_socket sid, nng_msg **msgp, int flags)
 {
-	nni_time expire;
-	int rv;
+	nni_time  expire;
+	int       rv;
 	nni_sock *sock;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
@@ -169,12 +162,11 @@ nng_recvmsg(nng_socket sid, nng_msg **msgp, int flags)
 	return (rv);
 }
 
-
 int
 nng_send(nng_socket sid, void *buf, size_t len, int flags)
 {
 	nng_msg *msg;
-	int rv;
+	int      rv;
 
 	if ((rv = nng_msg_alloc(&msg, len)) != 0) {
 		return (rv);
@@ -188,26 +180,23 @@ nng_send(nng_socket sid, void *buf, size_t len, int flags)
 	return (rv);
 }
 
-
 void *
 nng_alloc(size_t sz)
 {
 	return (nni_alloc(sz));
 }
 
-
 void
 nng_free(void *buf, size_t sz)
 {
 	nni_free(buf, sz);
 }
 
-
 int
 nng_sendmsg(nng_socket sid, nng_msg *msg, int flags)
 {
-	nni_time expire;
-	int rv;
+	nni_time  expire;
+	int       rv;
 	nni_sock *sock;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
@@ -227,12 +216,11 @@ nng_sendmsg(nng_socket sid, nng_msg *msg, int flags)
 	return (rv);
 }
 
-
 int
 nng_dial(nng_socket sid, const char *addr, nng_endpoint *epp, int flags)
 {
-	nni_ep *ep;
-	int rv;
+	nni_ep *  ep;
+	int       rv;
 	nni_sock *sock;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
@@ -247,12 +235,11 @@ nng_dial(nng_socket sid, const char *addr, nng_endpoint *epp, int flags)
 	return (rv);
 }
 
-
 int
 nng_listen(nng_socket sid, const char *addr, nng_endpoint *epp, int flags)
 {
-	nni_ep *ep;
-	int rv;
+	nni_ep *  ep;
+	int       rv;
 	nni_sock *sock;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
@@ -267,11 +254,10 @@ nng_listen(nng_socket sid, const char *addr, nng_endpoint *epp, int flags)
 	return (rv);
 }
 
-
 int
 nng_endpoint_close(nng_endpoint eid)
 {
-	int rv;
+	int     rv;
 	nni_ep *ep;
 
 	if ((rv = nni_ep_find(&ep, eid)) != 0) {
@@ -281,12 +267,11 @@ nng_endpoint_close(nng_endpoint eid)
 	return (0);
 }
 
-
 int
 nng_setopt(nng_socket sid, int opt, const void *val, size_t sz)
 {
 	nni_sock *sock;
-	int rv;
+	int       rv;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
 		return (rv);
@@ -296,12 +281,11 @@ nng_setopt(nng_socket sid, int opt, const void *val, size_t sz)
 	return (rv);
 }
 
-
 int
 nng_getopt(nng_socket sid, int opt, void *val, size_t *szp)
 {
 	nni_sock *sock;
-	int rv;
+	int       rv;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
 		return (rv);
@@ -311,13 +295,12 @@ nng_getopt(nng_socket sid, int opt, void *val, size_t *szp)
 	return (rv);
 }
 
-
 nng_notify *
 nng_setnotify(nng_socket sid, int mask, nng_notify_func fn, void *arg)
 {
-	nni_sock *sock;
+	nni_sock *  sock;
 	nng_notify *notify;
-	int rv;
+	int         rv;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
 		return (NULL);
@@ -327,12 +310,11 @@ nng_setnotify(nng_socket sid, int mask, nng_notify_func fn, void *arg)
 	return (notify);
 }
 
-
 void
 nng_unsetnotify(nng_socket sid, nng_notify *notify)
 {
 	nni_sock *sock;
-	int rv;
+	int       rv;
 
 	if ((rv = nni_sock_find(&sock, sid)) != 0) {
 		return;
@@ -341,7 +323,6 @@ nng_unsetnotify(nng_socket sid, nng_notify *notify)
 	nni_sock_rele(sock);
 }
 
-
 nng_socket
 nng_event_socket(nng_event *ev)
 {
@@ -349,27 +330,25 @@ nng_event_socket(nng_event *ev)
 	return (nni_sock_id(ev->e_sock));
 }
 
-
 int
 nng_event_type(nng_event *ev)
 {
 	return (ev->e_type);
 }
 
-
 int
 nng_device(nng_socket s1, nng_socket s2)
 {
-	int rv;
+	int       rv;
 	nni_sock *sock1 = NULL;
 	nni_sock *sock2 = NULL;
 
-	if ((s1 > 0) && (s1 != (nng_socket)-1)) {
+	if ((s1 > 0) && (s1 != (nng_socket) -1)) {
 		if ((rv = nni_sock_find(&sock1, s1)) != 0) {
 			return (rv);
 		}
 	}
-	if (((s2 > 0) && (s2 != (nng_socket)-1)) && (s2 != s1)) {
+	if (((s2 > 0) && (s2 != (nng_socket) -1)) && (s2 != s1)) {
 		if ((rv = nni_sock_find(&sock2, s2)) != 0) {
 			nni_sock_rele(sock1);
 			return (rv);
@@ -380,14 +359,13 @@ nng_device(nng_socket s1, nng_socket s2)
 	return (rv);
 }
 
-
 // Misc.
 const char *
 nng_strerror(int num)
 {
 	switch (num) {
 	case 0:
-		return ("Hunky dory");  // What did you expect?
+		return ("Hunky dory"); // What did you expect?
 
 	case NNG_EINTR:
 		return ("Interrupted");
@@ -457,7 +435,6 @@ nng_strerror(int num)
 	return ("Unknown error");
 }
 
-
 #if 0
 int
 nng_pipe_getopt(nng_pipe *pipe, int opt, void *val, size_t *sizep)
@@ -480,10 +457,8 @@ nng_pipe_close(nng_pipe *pipe)
 	return (0);
 }
 
-
 #endif
 
-
 // Message handling.
 int
 nng_msg_alloc(nng_msg **msgp, size_t size)
@@ -491,112 +466,96 @@ nng_msg_alloc(nng_msg **msgp, size_t size)
 	return (nni_msg_alloc(msgp, size));
 }
 
-
 int
 nng_msg_realloc(nng_msg *msg, size_t sz)
 {
 	return (nni_msg_realloc(msg, sz));
 }
 
-
 void
 nng_msg_free(nng_msg *msg)
 {
 	nni_msg_free(msg);
 }
 
-
 void *
 nng_msg_body(nng_msg *msg)
 {
 	return (nni_msg_body(msg));
 }
 
-
 size_t
 nng_msg_len(nng_msg *msg)
 {
 	return (nni_msg_len(msg));
 }
 
-
 void *
 nng_msg_header(nng_msg *msg)
 {
 	return (nni_msg_header(msg));
 }
 
-
 size_t
 nng_msg_header_len(nng_msg *msg)
 {
 	return (nni_msg_header_len(msg));
 }
 
-
 int
 nng_msg_append(nng_msg *msg, const void *data, size_t sz)
 {
 	return (nni_msg_append(msg, data, sz));
 }
 
-
 int
 nng_msg_prepend(nng_msg *msg, const void *data, size_t sz)
 {
 	return (nni_msg_prepend(msg, data, sz));
 }
 
-
 int
 nng_msg_append_header(nng_msg *msg, const void *data, size_t sz)
 {
 	return (nni_msg_append_header(msg, data, sz));
 }
 
-
 int
 nng_msg_prepend_header(nng_msg *msg, const void *data, size_t sz)
 {
 	return (nni_msg_prepend_header(msg, data, sz));
 }
 
-
 int
 nng_msg_trim(nng_msg *msg, size_t sz)
 {
 	return (nni_msg_trim(msg, sz));
 }
 
-
 int
 nng_msg_trunc(nng_msg *msg, size_t sz)
 {
 	return (nni_msg_trunc(msg, sz));
 }
 
-
 int
 nng_msg_trim_header(nng_msg *msg, size_t sz)
 {
 	return (nni_msg_trim_header(msg, sz));
 }
 
-
 int
 nng_msg_trunc_header(nng_msg *msg, size_t sz)
 {
 	return (nni_msg_trunc_header(msg, sz));
 }
 
-
 int
 nng_msg_getopt(nng_msg *msg, int opt, void *ptr, size_t *szp)
 {
 	return (nni_msg_getopt(msg, opt, ptr, szp));
 }
 
-
 int
 nng_snapshot_create(nng_socket sock, nng_snapshot **snapp)
 {
@@ -604,14 +563,12 @@ nng_snapshot_create(nng_socket sock, nng_snapshot **snapp)
 	return (NNG_ENOTSUP);
 }
 
-
 void
 nng_snapshot_destroy(nng_snapshot *snap)
 {
 	// Stats TBD.
 }
 
-
 int
 nng_snapshot_update(nng_snapshot *snap)
 {
@@ -619,7 +576,6 @@ nng_snapshot_update(nng_snapshot *snap)
 	return (NNG_ENOTSUP);
 }
 
-
 int
 nng_snapshot_next(nng_snapshot *snap, nng_stat **statp)
 {
@@ -628,7 +584,6 @@ nng_snapshot_next(nng_snapshot *snap, nng_stat **statp)
 	return (NNG_ENOTSUP);
 }
 
-
 const char *
 nng_stat_name(nng_stat *stat)
 {
@@ -636,7 +591,6 @@ nng_stat_name(nng_stat *stat)
 	return (NULL);
 }
 
-
 int
 nng_stat_type(nng_stat *stat)
 {
@@ -644,7 +598,6 @@ nng_stat_type(nng_stat *stat)
 	return (0);
 }
 
-
 int64_t
 nng_stat_value(nng_stat *stat)
 {
@@ -652,7 +605,6 @@ nng_stat_value(nng_stat *stat)
 	return (0);
 }
 
-
 // These routines exist as utility functions, exposing some of our "guts"
 // to the external world for the purposes of test code and bundled utilities.
 // They should not be considered part of our public API, and applications
@@ -664,14 +616,12 @@ nng_usleep(uint64_t usec)
 	nni_usleep(usec);
 }
 
-
 uint64_t
 nng_clock(void)
 {
 	return ((uint64_t) nni_clock());
 }
 
-
 // nng_thread_create creates a thread structure, and starts it running.
 // Unlike the internals, this allocates stuff dynamically, and does not
 // wait to start.
@@ -679,14 +629,14 @@ int
 nng_thread_create(void **thrp, void (*func)(void *), void *arg)
 {
 	nni_thr *thr;
-	int rv;
+	int      rv;
 
 	nni_init();
 
 	if ((thr = NNI_ALLOC_STRUCT(thr)) == NULL) {
 		return (NNG_ENOMEM);
 	}
-	memset(thr, 0, sizeof (*thr));
+	memset(thr, 0, sizeof(*thr));
 	*thrp = thr;
 	if ((rv = nni_thr_init(thr, func, arg)) != 0) {
 		return (rv);
@@ -695,7 +645,6 @@ nng_thread_create(void **thrp, void (*func)(void *), void *arg)
 	return (0);
 }
 
-
 void
 nng_thread_destroy(void *arg)
 {