From 6be0512728ec68a1e29c992b12d06d79b012077e Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Wed, 14 Dec 2022 09:25:04 -0800
Subject: [PATCH] Peer review cleanups.

---
 src/sniffer.c                         |  2 +-
 sslSniffer/sslSnifferTest/snifftest.c | 12 ++++--
 wolfssl/wolfcrypt/wc_port.h           | 62 +++++++++++++++------------
 3 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/src/sniffer.c b/src/sniffer.c
index 276a6e0c8..9665fbf2c 100644
--- a/src/sniffer.c
+++ b/src/sniffer.c
@@ -718,7 +718,7 @@ void ssl_InitSniffer_ex2(int threadNum)
 
 #ifdef WOLFSSL_ASYNC_CRYPT
 #ifndef WC_NO_ASYNC_THREADING
-    if (wolfAsync_DevOpenThread(&devId,&threadNum) < 0)
+    if (wolfAsync_DevOpenThread(&devId, &threadNum) < 0)
 #else
     if (wolfAsync_DevOpen(&devId) < 0)
 #endif
diff --git a/sslSniffer/sslSnifferTest/snifftest.c b/sslSniffer/sslSnifferTest/snifftest.c
index 326f738dd..27571e4ef 100644
--- a/sslSniffer/sslSnifferTest/snifftest.c
+++ b/sslSniffer/sslSnifferTest/snifftest.c
@@ -600,18 +600,21 @@ typedef struct {
 } wm_Sem;
 
  /* Posix style semaphore */
-static int wm_SemInit(wm_Sem *s){
+static int wm_SemInit(wm_Sem *s)
+{
     s->lockCount = 0;
     pthread_mutex_init(&s->mutex, NULL);
     pthread_cond_init(&s->cond, NULL);
     return 0;
 }
-static int wm_SemFree(wm_Sem *s){
+static int wm_SemFree(wm_Sem *s)
+{
     pthread_mutex_destroy(&s->mutex);
     pthread_cond_destroy(&s->cond);
     return 0;
 }
-static int wm_SemLock(wm_Sem *s){
+static int wm_SemLock(wm_Sem *s)
+{
     pthread_mutex_lock(&s->mutex);
     while (s->lockCount > 0)
         pthread_cond_wait(&s->cond, &s->mutex);
@@ -619,7 +622,8 @@ static int wm_SemLock(wm_Sem *s){
     pthread_mutex_unlock(&s->mutex);
     return 0;
 }
-static int wm_SemUnlock(wm_Sem *s){
+static int wm_SemUnlock(wm_Sem *s)
+{
     pthread_mutex_lock(&s->mutex);
     s->lockCount--;
     pthread_cond_signal(&s->cond);
diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
index fbfa1d5b9..d0d54ee94 100644
--- a/wolfssl/wolfcrypt/wc_port.h
+++ b/wolfssl/wolfcrypt/wc_port.h
@@ -291,37 +291,43 @@ typedef struct wolfSSL_Ref {
 } wolfSSL_Ref;
 
 #ifdef SINGLE_THREADED
-#define wolfSSL_RefInit(ref, err) do {      \
-    (ref)->count = 1;                       \
-    *(err) = 0;                             \
-} while(0);
+#define wolfSSL_RefInit(ref, err)            \
+    do {                                     \
+        (ref)->count = 1;                    \
+        *(err) = 0;                          \
+    } while(0)
 #define wolfSSL_RefFree(ref)
-#define wolfSSL_RefInc(ref, err) do {      \
-    (ref)->count++;                        \
-    *(err) = 0;                            \
-} while(0);
-#define wolfSSL_RefDec(ref, isZero, err) do { \
-    (ref)->count--;                           \
-    *(isZero) = ((ref)->count == 0);          \
-    *(err) = 0;                               \
-} while(0);
+    #define wolfSSL_RefInc(ref, err)         \
+    do {                                     \
+        (ref)->count++;                      \
+        *(err) = 0;                          \
+    } while(0)
+#define wolfSSL_RefDec(ref, isZero, err)     \
+    do {                                     \
+        (ref)->count--;                      \
+        *(isZero) = ((ref)->count == 0);     \
+        *(err) = 0;                          \
+    } while(0)
 #elif defined(HAVE_C___ATOMIC)
-#define wolfSSL_RefInit(ref, err) do {      \
-    (ref)->count = 1;                       \
-    *(err) = 0;                             \
-} while(0);
+#define wolfSSL_RefInit(ref, err)            \
+    do {                                     \
+        (ref)->count = 1;                    \
+        *(err) = 0;                          \
+    } while(0)
 #define wolfSSL_RefFree(ref)
-#define wolfSSL_RefInc(ref, err)  do {      \
-    __atomic_fetch_add(&(ref)->count, 1,    \
-        __ATOMIC_RELAXED);                  \
-    *(err) = 0;                             \
-} while(0);
-#define wolfSSL_RefDec(ref, isZero, err) do { \
-    __atomic_fetch_sub(&(ref)->count, 1,      \
-        __ATOMIC_RELAXED);                    \
-    *(isZero) = ((ref)->count == 0);          \
-    *(err) = 0;                               \
-} while(0);
+#define wolfSSL_RefInc(ref, err)             \
+    do {                                     \
+        __atomic_fetch_add(&(ref)->count, 1, \
+            __ATOMIC_RELAXED);               \
+        *(err) = 0;                          \
+    } while(0)
+#define wolfSSL_RefDec(ref, isZero, err)     \
+    do {                                     \
+        __atomic_fetch_sub(&(ref)->count, 1, \
+            __ATOMIC_RELAXED);               \
+        *(isZero) = ((ref)->count == 0);     \
+        *(err) = 0;                          \
+    } while(0)
 #else
 WOLFSSL_LOCAL void wolfSSL_RefInit(wolfSSL_Ref* ref, int* err);
 WOLFSSL_LOCAL void wolfSSL_RefFree(wolfSSL_Ref* ref);