Merge pull request #3 from drowe67/dr-cleanup21.2.0

Cleanup Part 2

1 files changed, 64 insertions, 67 deletions

diff --git a/unittest/tfifo.c b/unittest/tfifo.c
index 0987db6..bedda4f 100644
--- a/unittest/tfifo.c
+++ b/unittest/tfifo.c
@@ -7,15 +7,16 @@
 */
 
 #include <assert.h>
-#include <stdio.h>
 #include <pthread.h>
+#include <stdio.h>
+
 #include "codec2_fifo.h"
 
-#define FIFO_SZ  1024
+#define FIFO_SZ 1024
 #define WRITE_SZ 10
-#define READ_SZ  8
-#define N_MAX    100
-#define LOOPS    1000000
+#define READ_SZ 8
+#define N_MAX 100
+#define LOOPS 1000000
 
 int run_thread = 1;
 struct FIFO *f;
@@ -28,79 +29,75 @@ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 //#define USE_MUTEX
 
 int main() {
-    pthread_t awriter_thread;
-    int    i,j;
-    short  read_buf[READ_SZ];
-    int    n_out = 0;
-    int    success;
-
-    f = codec2_fifo_create(FIFO_SZ);
-    #ifdef USE_THREADS
-    pthread_create(&awriter_thread, NULL, writer_thread, NULL);
-    #endif
-
-    for(i=0; i<LOOPS; ) {
-        #ifndef USE_THREADS
-        writer();
-        #endif
-
-        #ifdef USE_MUTEX
-        pthread_mutex_lock(&mutex);
-        #endif
-        success = (codec2_fifo_read(f, read_buf, READ_SZ) == 0);
-        #ifdef USE_MUTEX
-        pthread_mutex_unlock(&mutex);
-        #endif
-
-	if (success) {
-	    for(j=0; j<READ_SZ; j++) {
-                if (read_buf[j] != n_out) {
-                    printf("error: %d %d\n", read_buf[j], n_out);
-                    return(1);
-                }
-                n_out++;
-                if (n_out == N_MAX)
-                    n_out = 0;
-            }
-            i++;
+  pthread_t awriter_thread;
+  int i, j;
+  short read_buf[READ_SZ];
+  int n_out = 0;
+  int success;
+
+  f = codec2_fifo_create(FIFO_SZ);
+#ifdef USE_THREADS
+  pthread_create(&awriter_thread, NULL, writer_thread, NULL);
+#endif
+
+  for (i = 0; i < LOOPS;) {
+#ifndef USE_THREADS
+    writer();
+#endif
+
+#ifdef USE_MUTEX
+    pthread_mutex_lock(&mutex);
+#endif
+    success = (codec2_fifo_read(f, read_buf, READ_SZ) == 0);
+#ifdef USE_MUTEX
+    pthread_mutex_unlock(&mutex);
+#endif
+
+    if (success) {
+      for (j = 0; j < READ_SZ; j++) {
+        if (read_buf[j] != n_out) {
+          printf("error: %d %d\n", read_buf[j], n_out);
+          return (1);
         }
-
+        n_out++;
+        if (n_out == N_MAX) n_out = 0;
+      }
+      i++;
     }
+  }
 
-    #ifdef USE_THREADS
-    run_thread = 0;
-    pthread_join(awriter_thread,NULL);
-    #endif
+#ifdef USE_THREADS
+  run_thread = 0;
+  pthread_join(awriter_thread, NULL);
+#endif
 
-    printf("%d loops tested OK\n", LOOPS);
-    return 0;
+  printf("%d loops tested OK\n", LOOPS);
+  return 0;
 }
 
-int    n_in = 0;
+int n_in = 0;
 
 void writer(void) {
-    short  write_buf[WRITE_SZ];
-    int    i;
-
-    if ((FIFO_SZ - codec2_fifo_used(f)) > WRITE_SZ) {
-        for(i=0; i<WRITE_SZ; i++) {
-            write_buf[i] = n_in++;
-            if (n_in == N_MAX)
-                n_in = 0;
-        }
-        #ifdef USE_MUTEX
-        pthread_mutex_lock(&mutex);
-        #endif
-        codec2_fifo_write(f, write_buf, WRITE_SZ);
-        pthread_mutex_unlock(&mutex);
+  short write_buf[WRITE_SZ];
+  int i;
+
+  if ((FIFO_SZ - codec2_fifo_used(f)) > WRITE_SZ) {
+    for (i = 0; i < WRITE_SZ; i++) {
+      write_buf[i] = n_in++;
+      if (n_in == N_MAX) n_in = 0;
     }
+#ifdef USE_MUTEX
+    pthread_mutex_lock(&mutex);
+#endif
+    codec2_fifo_write(f, write_buf, WRITE_SZ);
+    pthread_mutex_unlock(&mutex);
+  }
 }
 
 void *writer_thread(void *data) {
+  while (run_thread) {
+    writer();
+  }
 
-    while(run_thread) {
-        writer();
-    }
-
-    return NULL;
+  return NULL;
 }