Use `const` for nng_stat when possible.

This should help the compiler enforce checks, and may result
in better optimizations.

2 files changed, 32 insertions, 30 deletions

diff --git a/src/sp/protocol/pair1/pair1_poly_test.c b/src/sp/protocol/pair1/pair1_poly_test.c
index 3aabb248..895dd935 100644
--- a/src/sp/protocol/pair1/pair1_poly_test.c
+++ b/src/sp/protocol/pair1/pair1_poly_test.c
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -22,7 +22,7 @@ test_poly_identity(void)
 {
 	nng_socket s;
 	int        p;
-	char *     n;
+	char      *n;
 
 	NUTS_PASS(nng_pair1_open_poly(&s));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_PROTO, &p));
@@ -43,7 +43,7 @@ test_poly_best_effort(void)
 {
 	nng_socket s1;
 	nng_socket c1;
-	nng_msg *  msg;
+	nng_msg   *msg;
 
 	NUTS_PASS(nng_pair1_open_poly(&s1));
 	NUTS_PASS(nng_pair1_open(&c1));
@@ -70,7 +70,7 @@ test_poly_cooked(void)
 	nng_socket s1;
 	nng_socket c1;
 	nng_socket c2;
-	nng_msg *  msg;
+	nng_msg   *msg;
 	bool       v;
 	nng_pipe   p1;
 	nng_pipe   p2;
@@ -146,7 +146,7 @@ test_poly_default(void)
 	nng_socket s1;
 	nng_socket c1;
 	nng_socket c2;
-	nng_msg *  msg;
+	nng_msg   *msg;
 
 	NUTS_PASS(nng_pair1_open_poly(&s1));
 	NUTS_PASS(nng_pair1_open(&c1));
@@ -211,7 +211,7 @@ test_poly_recv_no_header(void)
 {
 	nng_socket s;
 	nng_socket c;
-	nng_msg *  m;
+	nng_msg   *m;
 
 	NUTS_PASS(nng_pair1_open_poly(&s));
 	NUTS_PASS(nng_pair1_open(&c));
@@ -234,7 +234,7 @@ test_poly_recv_garbage(void)
 {
 	nng_socket s;
 	nng_socket c;
-	nng_msg *  m;
+	nng_msg   *m;
 
 	NUTS_PASS(nng_pair1_open_poly(&s));
 	NUTS_PASS(nng_pair1_open(&c));
@@ -259,7 +259,7 @@ test_poly_ttl(void)
 {
 	nng_socket s1;
 	nng_socket c1;
-	nng_msg *  msg;
+	nng_msg   *msg;
 	uint32_t   val;
 	int        ttl;
 
@@ -327,10 +327,10 @@ test_poly_ttl(void)
 void
 test_poly_validate_peer(void)
 {
-	nng_socket s1, s2;
-	nng_stat * stats;
-	nng_stat * reject;
-	char *     addr;
+	nng_socket      s1, s2;
+	nng_stat       *stats;
+	const nng_stat *reject;
+	char           *addr;
 
 	NUTS_ADDR(addr, "inproc");
 
diff --git a/src/sp/protocol/pair1/pair1_test.c b/src/sp/protocol/pair1/pair1_test.c
index 83c96478..ea80d80c 100644
--- a/src/sp/protocol/pair1/pair1_test.c
+++ b/src/sp/protocol/pair1/pair1_test.c
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -22,7 +22,7 @@ test_mono_identity(void)
 {
 	nng_socket s;
 	int        p;
-	char *     n;
+	char      *n;
 
 	NUTS_PASS(nng_pair1_open(&s));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_PROTO, &p));
@@ -43,7 +43,7 @@ test_mono_cooked(void)
 {
 	nng_socket s1;
 	nng_socket c1;
-	nng_msg *  msg;
+	nng_msg   *msg;
 
 	NUTS_PASS(nng_pair1_open(&s1));
 	NUTS_PASS(nng_pair1_open(&c1));
@@ -75,7 +75,7 @@ test_mono_faithful(void)
 	nng_socket  s1;
 	nng_socket  c1;
 	nng_socket  c2;
-	nng_msg *   msg;
+	nng_msg    *msg;
 	const char *addr = "inproc://pair1_mono_faithful";
 
 	NUTS_PASS(nng_pair1_open(&s1));
@@ -116,7 +116,7 @@ test_mono_back_pressure(void)
 	nng_socket   c1;
 	int          i;
 	int          rv;
-	nng_msg *    msg;
+	nng_msg     *msg;
 	nng_duration to = 100;
 
 	NUTS_PASS(nng_pair1_open(&s1));
@@ -147,7 +147,7 @@ void
 test_send_no_peer(void)
 {
 	nng_socket   s1;
-	nng_msg *    msg;
+	nng_msg     *msg;
 	nng_duration to = 100;
 
 	NUTS_PASS(nng_pair1_open(&s1));
@@ -214,7 +214,7 @@ test_mono_raw_header(void)
 {
 	nng_socket s1;
 	nng_socket c1;
-	nng_msg *  msg;
+	nng_msg   *msg;
 	uint32_t   v;
 
 	NUTS_PASS(nng_pair1_open_raw(&s1));
@@ -269,8 +269,8 @@ void
 test_pair1_send_closed_aio(void)
 {
 	nng_socket s1;
-	nng_aio *  aio;
-	nng_msg *  msg;
+	nng_aio   *aio;
+	nng_msg   *msg;
 
 	NUTS_PASS(nng_aio_alloc(&aio, NULL, NULL));
 	NUTS_PASS(nng_msg_alloc(&msg, 0));
@@ -309,7 +309,7 @@ test_pair1_ttl(void)
 {
 	nng_socket s1;
 	nng_socket c1;
-	nng_msg *  msg;
+	nng_msg   *msg;
 	uint32_t   val;
 	int        ttl;
 
@@ -377,10 +377,10 @@ test_pair1_ttl(void)
 void
 test_pair1_validate_peer(void)
 {
-	nng_socket s1, s2;
-	nng_stat * stats;
-	nng_stat * reject;
-	char *     addr;
+	nng_socket      s1, s2;
+	nng_stat       *stats;
+	const nng_stat *reject;
+	char           *addr;
 
 	NUTS_ADDR(addr, "inproc");
 	NUTS_PASS(nng_pair1_open(&s1));
@@ -409,7 +409,7 @@ test_pair1_recv_no_header(void)
 {
 	nng_socket s;
 	nng_socket c;
-	nng_msg *  m;
+	nng_msg   *m;
 
 	NUTS_PASS(nng_pair1_open(&s));
 	NUTS_PASS(nng_pair1_open(&c));
@@ -432,7 +432,7 @@ test_pair1_recv_garbage(void)
 {
 	nng_socket s;
 	nng_socket c;
-	nng_msg *  m;
+	nng_msg   *m;
 
 	NUTS_PASS(nng_pair1_open(&s));
 	NUTS_PASS(nng_pair1_open(&c));
@@ -479,7 +479,8 @@ test_pair1_send_buffer(void)
 	NUTS_FAIL(nng_socket_get(s, NNG_OPT_SENDBUF, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, -1), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100000), NNG_EINVAL);
-	NUTS_FAIL(nng_socket_set_bool(s, NNG_OPT_SENDBUF, false), NNG_EBADTYPE);
+	NUTS_FAIL(
+	    nng_socket_set_bool(s, NNG_OPT_SENDBUF, false), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_set(s, NNG_OPT_SENDBUF, &b, 1), NNG_EINVAL);
 	NUTS_PASS(nng_socket_set_int(s, NNG_OPT_SENDBUF, 100));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_SENDBUF, &v));
@@ -503,7 +504,8 @@ test_pair1_recv_buffer(void)
 	NUTS_FAIL(nng_socket_get(s, NNG_OPT_RECVBUF, &b, &sz), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, -1), NNG_EINVAL);
 	NUTS_FAIL(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100000), NNG_EINVAL);
-	NUTS_FAIL(nng_socket_set_bool(s, NNG_OPT_RECVBUF, false), NNG_EBADTYPE);
+	NUTS_FAIL(
+	    nng_socket_set_bool(s, NNG_OPT_RECVBUF, false), NNG_EBADTYPE);
 	NUTS_FAIL(nng_socket_set(s, NNG_OPT_RECVBUF, &b, 1), NNG_EINVAL);
 	NUTS_PASS(nng_socket_set_int(s, NNG_OPT_RECVBUF, 100));
 	NUTS_PASS(nng_socket_get_int(s, NNG_OPT_RECVBUF, &v));