a few lint fixes

Dale Alleshouse · Dale Alleshouse · commit 948a0ccb1fa5 · 2020-06-12T13:28:54.000-04:00
diff --git a/src/hashing/farmhash.c b/src/hashing/farmhash.c
diff --git a/src/list_data_structures/algo_timer.c b/src/list_data_structures/algo_timer.c
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #include "./algo_timer.h"
 
 #include <stdint.h>
diff --git a/src/list_data_structures/algo_timer.h b/src/list_data_structures/algo_timer.h
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #pragma once
 
 #include <inttypes.h>
diff --git a/src/list_data_structures/algo_timer_tests.c b/src/list_data_structures/algo_timer_tests.c
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #include <stdbool.h>
 #include <stdlib.h>
 
diff --git a/src/list_data_structures/array.c b/src/list_data_structures/array.c
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #include "./array.h"
 
 #include <stdlib.h>
diff --git a/src/list_data_structures/array.h b/src/list_data_structures/array.h
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #pragma once
 
 #include <stddef.h>
diff --git a/src/list_data_structures/binary_tree.c b/src/list_data_structures/binary_tree.c
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #include "./binary_tree.h"
 
 #include <stdint.h>
diff --git a/src/list_data_structures/binary_tree.h b/src/list_data_structures/binary_tree.h
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #pragma once
 
 #include <stddef.h>
diff --git a/src/list_data_structures/binary_tree_test.c b/src/list_data_structures/binary_tree_test.c
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #include "./binary_tree.h"
 
 #include <limits.h>
diff --git a/src/list_data_structures/linked_list.c b/src/list_data_structures/linked_list.c
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #include "./linked_list.h"
 
 #include <stdlib.h>
@@ -231,7 +232,7 @@ void LinkedList_Destroy(LinkedList* list) {
     curr = curr->next;
 
     LinkedList_ItemDestroy(list, doomed);
-  };
+  }
 
   free(list);
 }
diff --git a/src/list_data_structures/linked_list.h b/src/list_data_structures/linked_list.h
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 /*******************************************************************************
  * This is a rather anomalous implementation because it's rarely the case that
  * anyone would want to insert/delete an item into a linked list at a particular
diff --git a/src/list_data_structures/linked_list_tests.c b/src/list_data_structures/linked_list_tests.c
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #include <stdbool.h>
 #include <stdlib.h>
 
@@ -25,9 +26,9 @@ static void ListIsValid(const LinkedList* list, const size_t n,
 
   LinkedListItem* item = list->head;
   for (size_t i = 0; i < n; i++) {
-    if (item == NULL || item->payload == NULL)
+    if (item == NULL || item->payload == NULL) {
       CU_FAIL("null item")
-    else {
+    } else {
       CU_ASSERT_PTR_EQUAL(item->payload, expected[i]);
       item = item->next;
     }
@@ -36,9 +37,9 @@ static void ListIsValid(const LinkedList* list, const size_t n,
 
   item = list->tail;
   for (size_t i = 1; i <= n; i++) {
-    if (item == NULL || item->payload == NULL)
+    if (item == NULL || item->payload == NULL) {
       CU_FAIL("null item")
-    else {
+    } else {
       CU_ASSERT_PTR_EQUAL(item->payload, expected[n - i]);
       item = item->prev;
     }
diff --git a/src/list_data_structures/list_operations.c b/src/list_data_structures/list_operations.c
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #include "./list_operations.h"
 
 #include <stdint.h>
diff --git a/src/list_data_structures/list_operations.h b/src/list_data_structures/list_operations.h
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #pragma once
 
 #include <stddef.h>
@@ -7,13 +8,13 @@
 
 const size_t RANK_ERROR;
 
-#define LIST_ERROR(list_type, result)                                       \
-  {                                                                         \
-    char str[1000];                                                         \
-    sprintf(str, "%s Error: %s, %s, %s, %d\n", list_type,                   \
-            ListOp_ErrorMessage(result), __FILE__, __FUNCTION__, __LINE__); \
-                                                                            \
-    ErrorReporter_Report(result, str);                                      \
+#define LIST_ERROR(list_type, result)                                        \
+  {                                                                          \
+    char str[1000];                                                          \
+    snprintf(str, sizeof(str), "%s Error: %s, %s, %s, %d\n", list_type,      \
+             ListOp_ErrorMessage(result), __FILE__, __FUNCTION__, __LINE__); \
+                                                                             \
+    ErrorReporter_Report(result, str);                                       \
   }
 
 typedef void (*item_handler)(void* x);
diff --git a/src/list_data_structures/sorted_array.c b/src/list_data_structures/sorted_array.c
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #include "./sorted_array.h"
 
 #include <stdio.h>
diff --git a/src/list_data_structures/sorted_array.h b/src/list_data_structures/sorted_array.h
@@ -1,3 +1,4 @@
+// Copyright 2020 Dale Alleshouse
 #pragma once
 
 #include "./array.h"
diff --git a/src/list_data_structures/sorted_array_test.c b/src/list_data_structures/sorted_array_test.c
@@ -14,12 +14,13 @@
 
 typedef void* (*SortedArrayOp)(const Array*, const void*);
 typedef void* (*SortedArrayOpUnary)(const Array*);
+static unsigned int seed;
 
 static Array* CreateSut(size_t n) {
   Array* sut = Array_Create(PIntComparator, sizeof(int));
   sut->array = calloc(sizeof(int), n);
 
-  for (size_t i = 0; i < n; i++) ((int*)sut->array)[i] = rand();
+  for (size_t i = 0; i < n; i++) ((int*)sut->array)[i] = rand_r(&seed);
 
   qsort(sut->array, n, sizeof(int), PIntComparator);
   sut->n = n;
@@ -326,6 +327,8 @@ static void SortedArray_Rank_standard() {
 }
 
 int RegisterSortedArrayTests() {
+  seed = time(NULL);
+
   CU_TestInfo Common_tests[] = {CU_TEST_INFO(SortedArray_null_parameter),
                                 CU_TEST_INFO_NULL};
 
diff --git a/src/test_runner.c b/src/test_runner.c
@@ -98,93 +98,61 @@ extern int RegisterMultiplySquareMatricesTests();
 extern int RegisterQuickSelectPartitionTests();
 
 int RegisterTests() {
-  return (RegisterGraphTests() != 0 + RegisterOverflowTests() !=
-          0 + RegisterMathTests() !=
-          0 +
-
-              RegisterCommonTests() !=
-          0 +
-
-              RegisterGraphSearchTests() !=
-          0 +
-
-              RegisterQueueTests() !=
-          0 + RegisterPriorityQueueTests() != 0 + RegisterStackTests() !=
-          0 + RegisterHeapTests() != 0 + RegisterHashTableTests() !=
-          0 + RegisterBloomFilterTests() != 0 + RegisterHashFunctionTests() !=
-          0 + RegisterDisjointSetTests() !=
-          0 +
-
-              RegisterKnapsackProblemTests() !=
-          0 +
-
-              RegisterRunningMedianTests() !=
-          0 +
-
-              RegisterSequenceAlignmentTests() !=
-          0 +
-
-              RegisterDijkstraTests() !=
-          0 + RegisterShortestPathTests() != 0 + RegisterBellmanFordTests() !=
-          0 + RegisterFloydWarshallTests() !=
-          0 +
-
-              RegisterHuffmanCodeTests() !=
-          0 +
-
-              RegisterLinkedListTests() !=
-          0 + RegisterArrayTests() != 0 + RegisterAlgoTimerTests() !=
-          0 + RegisterSortedArrayTests() != 0 + RegisterBinaryTreeTests() !=
-          0 +
-
-              RegisterGraphTests() !=
-          0 + RegisterMinCutTests() !=
-          0 +
-
-              RegisterSatisfiabilityTests() !=
-          0 +
-
-              RegisterQuickSortTests() !=
-          0 + RegisterPartitionTests() != 0 + RegisterBubbleSortTests() !=
-          0 + RegisterInsertionSortTests() !=
-          0 + RegisterSelectionSortTests() !=
-          0 + RegisterMergeSortTestTests() !=
-          0 +
-
-              RegisterTravelingSalesmanTests() !=
-          0 +
-
-              RegisterWeightedIndependentSetTests() !=
-          0 +
-
-              RegisterMallocTestWrapperTests() !=
-          0 +
-
-              RegisterMinSpanningTreeTests() !=
-          0 + RegisterKruskalClusterTests() !=
-          0 +
-
-              RegisterEuclidDistTests() !=
-          0 + RegisterClosestDistanceTests() !=
-          0 + RegisterClosestDistanceSlowTests() !=
-          0 +
-
-              RegisterSelectTests() !=
-          0 + RegisterQuickSelectTests() != 0 + RegisterPartitionTests() !=
-          0 +
-
-              RegisterInversionCountTests() !=
-          0 +
-
-              RegisterIsPowerOfTwoTests() !=
-          0 + RegisterMultiplySquareMatricesTests() !=
-          0 +
-
-              RegisterQuickSelectPartitionTests() !=
-          0
-
-          ) *
-         -1;
+  return (
+             // clang-format off
+      RegisterGraphTests() != 0 +
+      RegisterOverflowTests() != 0 +
+      RegisterMathTests() != 0 +
+      RegisterCommonTests() != 0 +
+      RegisterGraphSearchTests() != 0 +
+      RegisterQueueTests() != 0 +
+      RegisterPriorityQueueTests() != 0 +
+      RegisterStackTests() != 0 +
+      RegisterHeapTests() != 0 +
+      RegisterHashTableTests() != 0 +
+      RegisterBloomFilterTests() != 0 +
+      RegisterHashFunctionTests() != 0 +
+      RegisterDisjointSetTests() != 0 +
+      RegisterKnapsackProblemTests() != 0 +
+      RegisterRunningMedianTests() != 0 +
+      RegisterSequenceAlignmentTests() != 0 +
+      RegisterDijkstraTests() != 0 +
+      RegisterShortestPathTests() != 0 +
+      RegisterBellmanFordTests() != 0 +
+      RegisterFloydWarshallTests() != 0 +
+      RegisterHuffmanCodeTests() != 0 +
+      RegisterLinkedListTests() != 0 +
+      RegisterArrayTests() != 0 +
+      RegisterAlgoTimerTests() != 0 +
+      RegisterSortedArrayTests() != 0 +
+      RegisterBinaryTreeTests() != 0 +
+      RegisterGraphTests() != 0 +
+      RegisterMinCutTests() != 0 +
+      RegisterSatisfiabilityTests() != 0 +
+      RegisterQuickSortTests() != 0 +
+      RegisterPartitionTests() != 0 +
+      RegisterBubbleSortTests() != 0 +
+      RegisterInsertionSortTests() != 0 +
+      RegisterSelectionSortTests() != 0 +
+      RegisterMergeSortTestTests() != 0 +
+      RegisterTravelingSalesmanTests() != 0 +
+      RegisterWeightedIndependentSetTests() != 0 +
+      RegisterMallocTestWrapperTests() != 0 +
+      RegisterMinSpanningTreeTests() != 0 +
+      RegisterKruskalClusterTests() != 0 +
+      RegisterEuclidDistTests() != 0 +
+      RegisterClosestDistanceTests() != 0 +
+      RegisterClosestDistanceSlowTests() != 0 +
+      RegisterSelectTests() != 0 +
+      RegisterQuickSelectTests() != 0 +
+      RegisterPartitionTests() != 0 +
+      RegisterInversionCountTests() != 0 +
+      RegisterIsPowerOfTwoTests() != 0 +
+      RegisterMultiplySquareMatricesTests() != 0 +
+      RegisterQuickSelectPartitionTests() != 0
+      ) *
+      -1;
+  // clang-format on
 }
 
 int TestRunner(int (*register_tests)()) {
diff --git a/watch.sh b/watch.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-inotify-hookable -q -w ./ -C "\.[ch]$=make $1 --jobs=8"
+inotify-hookable -q -w ./ -C "\.[ch]$=$1"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// Copyright 2020 Dale Alleshouse`
`1`	`2`	`#include "./algo_timer.h"`
`2`	`3`
`3`	`4`	`#include <stdint.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// Copyright 2020 Dale Alleshouse`
`1`	`2`	`#pragma once`
`2`	`3`
`3`	`4`	`#include <inttypes.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// Copyright 2020 Dale Alleshouse`
`1`	`2`	`#include <stdbool.h>`
`2`	`3`	`#include <stdlib.h>`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// Copyright 2020 Dale Alleshouse`
`1`	`2`	`#include "./array.h"`
`2`	`3`
`3`	`4`	`#include <stdlib.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// Copyright 2020 Dale Alleshouse`
`1`	`2`	`#include "./binary_tree.h"`
`2`	`3`
`3`	`4`	`#include <stdint.h>`