style and consistency improved

Reviewed-on: #1

libkeke_array.c

@@ -1,21 +1,15 @@
-#ifndef LIBKEKE_ARRAY
-#define LIBKEKE_ARRAY
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include "libkeke_utils.h"
+// Required for qsort_r on Linux
+#define _GNU_SOURCE
+
 #include "libkeke_array.h"
-
-typedef struct {
-	size_t type_size;
-	size_t len;
-	size_t max_len;
-	void *content;
-} KekeArray;
+#include "libkeke_utils.h"
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define ARRAY_GET(array, i) ((array)->content + (array)->type_size * (i))
 
@@ -37,21 +31,26 @@ void keke_array_free(KekeArray *array) {
 
 void keke_array_set(KekeArray *array, size_t index, const void *value) {
   if (index >= array->max_len) {
-		array->content = realloc(array->content, (array->max_len << 1) * array->type_size);
-		memset(array->content + array->max_len * array->type_size, 0, array->max_len * array->type_size);
+    array->content =
+        realloc(array->content, (array->max_len << 1) * array->type_size);
+    memset(array->content + array->max_len * array->type_size, 0,
+           array->max_len * array->type_size);
     array->max_len <<= 1;
   }
-	if(index >= array->len) array->len = index + 1;
+  if (index >= array->len)
+    array->len = index + 1;
   memcpy(array->content + index * array->type_size, value, array->type_size);
 }
 
 void *keke_array_get(KekeArray *array, size_t index) {
-	if(index >= array->len) return NULL; // is ur fault
+  if (index >= array->len)
+    return NULL; // is ur fault
   return ARRAY_GET(array, index);
 }
 
 int keke_array_copy(KekeArray *array, size_t index, void *value) {
-	if(index >= array->len) return -1; // is ur fault
+  if (index >= array->len)
+    return -1; // is ur fault
   memcpy(value, ARRAY_GET(array, index), array->type_size);
   return 0;
 }
@@ -60,31 +59,40 @@ void keke_array_set_len(KekeArray *array, size_t new_len) {
   if (new_len >= array->max_len) {
     size_t new_max_len = 1;
     size_t len = new_len;
-		while(len >>= 1) new_max_len <<= 1;
+    while (len >>= 1)
+      new_max_len <<= 1;
     array->content = realloc(array->content, new_max_len * array->type_size);
-		memset(array->content + array->max_len * array->type_size, 0, (new_max_len - array->max_len) * array->type_size);
+    memset(array->content + array->max_len * array->type_size, 0,
+           (new_max_len - array->max_len) * array->type_size);
     array->max_len <<= 1;
   } else if (new_len < array->len) {
-        memset(array->content + new_len * array->type_size, 0, (array->len - new_len) * array->type_size);
+    memset(array->content + new_len * array->type_size, 0,
+           (array->len - new_len) * array->type_size);
   }
   array->len = new_len;
 }
 
 void keke_array_insert(KekeArray *array, size_t index, const void *value) {
   if (array->len + 1 > array->max_len) {
-		array->content = realloc(array->content, (array->max_len << 1) * array->type_size);
-		memset(array->content + array->max_len * array->type_size, 0, array->max_len * array->type_size);
+    array->content =
+        realloc(array->content, (array->max_len << 1) * array->type_size);
+    memset(array->content + array->max_len * array->type_size, 0,
+           array->max_len * array->type_size);
     array->max_len <<= 1;
   }
   keke_array_set_len(array, array->len + 1);
-    memmove(array->content + ((index + 1) * array->type_size), array->content + (index * array->type_size), (array->len - index - 1) * array->type_size);
+  memmove(array->content + ((index + 1) * array->type_size),
+          array->content + (index * array->type_size),
+          (array->len - index - 1) * array->type_size);
   memcpy(array->content + index * array->type_size, value, array->type_size);
 }
 
 void keke_array_remove(KekeArray *array, size_t index, void *value) {
   memcpy(value, array->content + index * array->type_size, array->type_size);
   keke_array_set_len(array, array->len - 1);
-    memmove(array->content + (index * array->type_size), array->content + ((index + 1) * array->type_size), (array->len - index + 1) * array->type_size);
+  memmove(array->content + (index * array->type_size),
+          array->content + ((index + 1) * array->type_size),
+          (array->len - index + 1) * array->type_size);
 }
 
 void keke_array_push(KekeArray *array, const void *value) {
@@ -97,36 +105,49 @@ void keke_array_pop(KekeArray *array, void *value) {
 
 void keke_array_delete(KekeArray *array, size_t index) {
   keke_array_set_len(array, array->len - 1);
-    memmove(array->content + (index * array->type_size), array->content + ((index + 1) * array->type_size), (array->len - index + 1) * array->type_size);
+  memmove(array->content + (index * array->type_size),
+          array->content + ((index + 1) * array->type_size),
+          (array->len - index + 1) * array->type_size);
 }
 
 void keke_array_swap_delete(KekeArray *array, size_t index) {
   size_t new_len = array->len - 1;
-	keke_swap(ARRAY_GET(array, index), ARRAY_GET(array, new_len), array->type_size);
+  keke_swap(ARRAY_GET(array, index), ARRAY_GET(array, new_len),
+            array->type_size);
   keke_array_set_len(array, new_len);
 }
 
 KekeArray *keke_array_yoink(KekeArray *array, size_t start_index, size_t len) {
-	if(start_index + len >= array->len) return NULL;
+  if (start_index + len >= array->len)
+    return NULL;
   KekeArray *ret = keke_array_alloc(len, array->type_size);
-	memcpy(ret->content, array->content + start_index * array->type_size, len * array->type_size);
-	memmove(array->content + start_index * array->type_size, array->content + (start_index + len) * array->type_size, (array->len - len - start_index) * array->type_size);
+  memcpy(ret->content, array->content + start_index * array->type_size,
+         len * array->type_size);
+  memmove(array->content + start_index * array->type_size,
+          array->content + (start_index + len) * array->type_size,
+          (array->len - len - start_index) * array->type_size);
   keke_array_set_len(array, array->len - len);
   return ret;
 }
 
-int keke_array_insert_data(KekeArray *array, size_t index, void *data, size_t len) {
-    if(index >= array->len) return -1;
+int keke_array_insert_data(KekeArray *array, size_t index, void *data,
+                           size_t len) {
+  if (index >= array->len)
+    return -1;
   size_t current_len = array->len;
   keke_array_set_len(array, current_len + len);
-    memmove(array->content + (index + len) * array->type_size, array->content + index * array->type_size, (current_len - index) * array->type_size);
-    memcpy(array->content + index * array->type_size, data, len * array->type_size);
+  memmove(array->content + (index + len) * array->type_size,
+          array->content + index * array->type_size,
+          (current_len - index) * array->type_size);
+  memcpy(array->content + index * array->type_size, data,
+         len * array->type_size);
   return 0;
 }
 
 int keke_array_plop(KekeArray *array, size_t index, KekeArray *array2) {
   int ret = keke_array_insert_data(array, index, array2->content, array2->len);
-    if(ret) return ret;
+  if (ret)
+    return ret;
   keke_array_free(array2);
   return 0;
 }
@@ -134,7 +155,8 @@ int keke_array_plop(KekeArray *array, size_t index, KekeArray *array2) {
 typedef void (*Foreach_func)(void *, size_t, KekeArray *);
 
 void keke_array_foreach(KekeArray *array, Foreach_func callback) {
-    for(size_t i = 0; i < array->len; i++) callback(ARRAY_GET(array, i), i, array);
+  for (size_t i = 0; i < array->len; i++)
+    callback(ARRAY_GET(array, i), i, array);
 }
 
 KekeArray *keke_array_clone(KekeArray *array) {
@@ -146,12 +168,15 @@ KekeArray *keke_array_clone(KekeArray *array) {
 }
 
 void keke_array_fill(KekeArray *array, const void *value) {
-    for(size_t i = 0; i < array->len; i++) memcpy(ARRAY_GET(array, i), value, array->type_size);
+  for (size_t i = 0; i < array->len; i++)
+    memcpy(ARRAY_GET(array, i), value, array->type_size);
 }
 
 void keke_array_reverse(KekeArray *array) {
   for (size_t i = 0; i < array->len / 2; i++) {
-    	keke_swap(ARRAY_GET(array, i), array->content + array->type_size * (array->len - i - 1), array->type_size);
+    keke_swap(ARRAY_GET(array, i),
+              array->content + array->type_size * (array->len - i - 1),
+              array->type_size);
   }
 }
 
@@ -159,20 +184,23 @@ typedef bool (*Test_func)(void *, size_t, KekeArray *);
 
 bool keke_array_some(KekeArray *array, Test_func test) {
   bool ret = false;
-    for(size_t i = 0; i < array->len; i++) ret = ret || test(ARRAY_GET(array, i), i, array);	
+  for (size_t i = 0; i < array->len; i++)
+    ret = ret || test(ARRAY_GET(array, i), i, array);
   return ret;
 }
 
 bool keke_array_all(KekeArray *array, Test_func test) {
   bool ret = true;
-    for(size_t i = 0; i < array->len; i++) ret = ret && test(ARRAY_GET(array, i), i, array);	
+  for (size_t i = 0; i < array->len; i++)
+    ret = ret && test(ARRAY_GET(array, i), i, array);
   return ret;
 }
 
 void *keke_array_find(KekeArray *array, Test_func test) {
   for (size_t i = 0; i < array->len; i++) {
     void *current = ARRAY_GET(array, i);
-		if(test(current, i, array)) return current;
+    if (test(current, i, array))
+      return current;
   }
   return NULL;
 }
@@ -180,12 +208,23 @@ void *keke_array_find(KekeArray *array, Test_func test) {
 void *keke_array_find_start(KekeArray *array, void *start, size_t size) {
   for (size_t i = 0; i < array->len; i++) {
     void *current = ARRAY_GET(array, i);
-		if(memcmp(current, start, size) == 0) return current;
+    if (memcmp(current, start, size) == 0)
+      return current;
   }
   return NULL;
 }
 
-int compar(const void *a, const void *b, void *size_v) {
+/* Windows uses qsort_s rather than qsort_r and wants a BSD-style comparison
+ * function. This will transparently switch the comparison function based on
+ * platform. */
+#if _WIN32
+#define qsort_r qsort_s
+#define compar(a, b, size_v) _compar(size_v, a, b)
+int _compar(void *size_v, const void *a, const void *b) {
+#else
+#define compar(a, b, size_v) _compar(a, b, size_v)
+int _compar(const void *a, const void *b, void *size_v) {
+#endif
   size_t size = *(size_t *)size_v;
 #if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
   return memcmp(a, b, size);
@@ -204,7 +243,8 @@ int compar(const void *a, const void *b, void *size_v) {
     const char *d = b;
     for (size_t i = 1; i <= rem; ++i) {
       char j = c[size + rem - i] - d[size + rem - i];
-			if(j != 0) return j;
+      if (j != 0)
+        return j;
     }
   }
   const int *ia = a;
@@ -212,18 +252,21 @@ int compar(const void *a, const void *b, void *size_v) {
   size /= sizeof(int);
   for (size_t i = 1; i <= size; ++i) {
     int j = ia[size - i] - ib[size - i];
-		if(j != 0) return j;
+    if (j != 0)
+      return j;
   }
   return 0;
 #endif
 }
 
 void keke_array_qsort(KekeArray *array) {
-	qsort_r(array->content, array->len, array->type_size, compar, &array->type_size);
+  qsort_r(array->content, array->len, array->type_size, _compar,
+          &array->type_size);
 }
 
 void keke_array_qsort_header(KekeArray *array, size_t start_header_size) {
-	qsort_r(array->content, array->len, array->type_size, compar, &start_header_size);
+  qsort_r(array->content, array->len, array->type_size, _compar,
+          &start_header_size);
 }
 
 typedef int (*Rng_fun)(int);
@@ -249,12 +292,14 @@ KekeArray *keke_array_merge(KekeArray *a, KekeArray *b) {
   }
   keke_array_reverse(a);
   keke_array_reverse(b);
-	if(a->type_size != b->type_size) return NULL;
+  if (a->type_size != b->type_size)
+    return NULL;
   KekeArray *c = keke_array_alloc(a->len + b->len, a->type_size);
   keke_array_set_len(c, 0);
   void *s = malloc(a->type_size);
   while (!!(a->len) && !!(b->len)) {
-		if(compar(ARRAY_GET(a, a->len - 1), ARRAY_GET(b, b->len - 1), &a->type_size) <= 0) {
+    if (compar(ARRAY_GET(a, a->len - 1), ARRAY_GET(b, b->len - 1),
+               &a->type_size) <= 0) {
       keke_array_pop(a, s);
       keke_array_push(c, s);
     } else {
@@ -274,7 +319,8 @@ KekeArray *keke_array_merge(KekeArray *a, KekeArray *b) {
   return c;
 }
 
-KekeArray *keke_array_merge_by_header(KekeArray *a, KekeArray *b, size_t header_size) {
+KekeArray *keke_array_merge_by_header(KekeArray *a, KekeArray *b,
+                                      size_t header_size) {
   if (a->len == 0) {
     KekeArray *r = keke_array_clone(b);
     keke_array_set_len(b, 0);
@@ -287,12 +333,14 @@ KekeArray *keke_array_merge_by_header(KekeArray *a, KekeArray *b, size_t header_
   }
   keke_array_reverse(a);
   keke_array_reverse(b);
-	if(a->type_size != b->type_size) return NULL;
+  if (a->type_size != b->type_size)
+    return NULL;
   KekeArray *c = keke_array_alloc(a->len + b->len, a->type_size);
   keke_array_set_len(c, 0);
   void *s = malloc(a->type_size);
   while (!!(a->len) && !!(b->len)) {
-		if(compar(ARRAY_GET(a, a->len - 1), ARRAY_GET(b, b->len - 1), &header_size) <= 0) {
+    if (compar(ARRAY_GET(a, a->len - 1), ARRAY_GET(b, b->len - 1),
+               &header_size) <= 0) {
       keke_array_pop(a, s);
       keke_array_push(c, s);
     } else {
@@ -325,9 +373,8 @@ KekeArray *keke_array_filter(KekeArray *array, Test_func test) {
 typedef void (*B_func)(void *, void *);
 
 void keke_array_reduce(KekeArray *array, B_func op, void *acc) {
-	for(size_t i = 0; i < array->len; i++) op(ARRAY_GET(array, i), acc);
+  for (size_t i = 0; i < array->len; i++)
+    op(ARRAY_GET(array, i), acc);
 }
 
 #undef ARRAY_GET
-
-#endif

libkeke_array.h

@@ -1,9 +1,7 @@
-#ifndef LIBKEKE_ARRAY
-#define LIBKEKE_ARRAY
-
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdbool.h>
+#pragma once
 
 typedef struct {
   size_t type_size;
@@ -27,7 +25,8 @@ void keke_array_pop(KekeArray *array, void *value);
 void keke_array_delete(KekeArray *array, size_t index);
 
 KekeArray *keke_array_yoink(KekeArray *array, size_t start_index, size_t len);
-int keke_array_insert_data(KekeArray *array, size_t index, void *data, size_t len);
+int keke_array_insert_data(KekeArray *array, size_t index, void *data,
+                           size_t len);
 int keke_array_plop(KekeArray *array, size_t index, KekeArray *array2);
 
 typedef void (*Foreach_func)(void *, size_t, KekeArray *);
@@ -40,7 +39,8 @@ void keke_array_reverse(KekeArray *array);
 void keke_array_qsort(KekeArray *array);
 void keke_array_qsort_header(KekeArray *array, size_t start_header_size);
 KekeArray *keke_array_merge(KekeArray *a, KekeArray *b);
-KekeArray *keke_array_merge_by_header(KekeArray *a, KekeArray *b, size_t start_header_size);
+KekeArray *keke_array_merge_by_header(KekeArray *a, KekeArray *b,
+                                      size_t start_header_size);
 typedef int (*Rng_fun)(int);
 void keke_array_shuffle(KekeArray *array, Rng_fun rng);
 
@@ -55,5 +55,3 @@ KekeArray *keke_array_filter(KekeArray *array, Test_func test);
 
 typedef void (*B_func)(void *, void *);
 void keke_array_reduce(KekeArray *array, B_func op, void *acc);
-
-#endif

libkeke_symbol.c

@@ -1,8 +1,6 @@
-#include <stdint.h>
 #include "libkeke_symbol.h"
+#include <stdint.h>
 
 static _Atomic KekeSymbol iota = KEKE_NULL_SYMBOL + 1;
 
-KekeSymbol keke_new_symbol() {
-	return iota++;
-}
+KekeSymbol keke_new_symbol() { return iota++; }

libkeke_utils.c

@@ -1,7 +1,8 @@
 #include <stddef.h>
 
 void keke_swap(void *a, void *b, size_t size) {
-	if(a == b) return;
+  if (a == b)
+    return;
   size_t i = 0;
   int *ia = a;
   int *ib = b;
@@ -22,6 +23,7 @@ void keke_swap(void *a, void *b, size_t size) {
 
 size_t bit_ceil(size_t s) {
   size_t t = 1;
-    while(t < s) t <<= 1;
+  while (t < s)
+    t <<= 1;
   return t;
 }

libkeke_utils.h

@@ -1,12 +1,8 @@
-#ifndef LIBKEKE_UTILS
-#define LIBKEKE_UTILS
 
+#pragma once
 #include <stddef.h>
 
 #define BOOL_PRETTY(b) (b ? "True" : "False")
 
 void keke_swap(void *, void *, size_t);
 size_t bit_ceil(size_t s);
-
-#endif
-

test_array.c

@@ -1,9 +1,9 @@
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 #include "libkeke_array.h"
 #include "libkeke_utils.h"
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define ARRAY_LEN 10
 #define ARRAY_ALT_LEN 512
@@ -16,33 +16,19 @@ void set_alt(void *, size_t index, KekeArray *array) {
   keke_array_set(array, ARRAY_ALT_LEN - index - 1, &index);
 }
 
-void output(void *i, size_t, KekeArray *) {
-    printf("%d, ", *(int *)i);
-}
+void output(void *i, size_t, KekeArray *) { printf("%d, ", *(int *)i); }
 
-void output_hex(void *i, size_t, KekeArray *) {
-    printf("%x, ", *(int *)i);
-}
+void output_hex(void *i, size_t, KekeArray *) { printf("%x, ", *(int *)i); }
 
-void sub4(void *i, size_t, KekeArray *) {
-	*(int *)i -= 4;
-}
+void sub4(void *i, size_t, KekeArray *) { *(int *)i -= 4; }
 
-void add250(void *i, size_t, KekeArray *) {
-	*(int *)i += 250;
-}
+void add250(void *i, size_t, KekeArray *) { *(int *)i += 250; }
 
-void sub250(void *i, size_t, KekeArray *) {
-	*(int *)i -= 250;
-}
+void sub250(void *i, size_t, KekeArray *) { *(int *)i -= 250; }
 
-bool heart(void *i, size_t, KekeArray *) {
-	return *(int *)i < 3;
-}
+bool heart(void *i, size_t, KekeArray *) { return *(int *)i < 3; }
 
-bool lt2(void *i, size_t, KekeArray *) {
-	return *(int *)i < 2;
-}
+bool lt2(void *i, size_t, KekeArray *) { return *(int *)i < 2; }
 
 void add(void *vx, void *vacc) {
   int *x = (int *)vx;
@@ -50,9 +36,7 @@ void add(void *vx, void *vacc) {
   *acc += *x;
 }
 
-int rng(int x) {
-	return rand() % x;
-}
+int rng(int x) { return rand() % x; }
 
 int main(void) {
   KekeArray *array = keke_array_alloc(ARRAY_LEN, sizeof(int));
@@ -176,7 +160,8 @@ int main(void) {
 
   keke_array_foreach(array5, add250);
   keke_array_qsort_header(array5, sizeof(int));
-	printf("Expected value:\n250, 251, 251, 252, 252, 252, 252, 253, 253, 253, 254, 255, 256, 257, 258, 259,\n");
+  printf("Expected value:\n250, 251, 251, 252, 252, 252, 252, 253, 253, 253, "
+         "254, 255, 256, 257, 258, 259,\n");
   keke_array_foreach(array5, output);
   puts("\n");
 

test_array_u64.c

@@ -1,9 +1,9 @@
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 #include "libkeke_array.h"
 #include "libkeke_utils.h"
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define ARRAY_LEN 10
 #define ARRAY_ALT_LEN 512
@@ -16,33 +16,21 @@ void set_alt(void *, size_t index, KekeArray *array) {
   keke_array_set(array, ARRAY_ALT_LEN - index - 1, &index);
 }
 
-void output(void *i, size_t, KekeArray *) {
-    printf("%lu, ", *(uint64_t *)i);
-}
+void output(void *i, size_t, KekeArray *) { printf("%lu, ", *(uint64_t *)i); }
 
 void output_hex(void *i, size_t, KekeArray *) {
   printf("%lx, ", *(uint64_t *)i);
 }
 
-void sub4(void *i, size_t, KekeArray *) {
-	*(uint64_t *)i -= 4;
-}
+void sub4(void *i, size_t, KekeArray *) { *(uint64_t *)i -= 4; }
 
-void add250(void *i, size_t, KekeArray *) {
-	*(uint64_t *)i += 250;
-}
+void add250(void *i, size_t, KekeArray *) { *(uint64_t *)i += 250; }
 
-void sub250(void *i, size_t, KekeArray *) {
-	*(uint64_t *)i -= 250;
-}
+void sub250(void *i, size_t, KekeArray *) { *(uint64_t *)i -= 250; }
 
-bool heart(void *i, size_t, KekeArray *) {
-	return *(uint64_t *)i < 3;
-}
+bool heart(void *i, size_t, KekeArray *) { return *(uint64_t *)i < 3; }
 
-bool lt2(void *i, size_t, KekeArray *) {
-	return *(uint64_t *)i < 2;
-}
+bool lt2(void *i, size_t, KekeArray *) { return *(uint64_t *)i < 2; }
 
 void add(void *vx, void *vacc) {
   uint64_t *x = (uint64_t *)vx;
@@ -50,9 +38,7 @@ void add(void *vx, void *vacc) {
   *acc += *x;
 }
 
-int rng(int x) {
-	return rand() % x;
-}
+int rng(int x) { return rand() % x; }
 
 int main(void) {
   KekeArray *array = keke_array_alloc(ARRAY_LEN, sizeof(uint64_t));
@@ -176,7 +162,8 @@ int main(void) {
 
   keke_array_foreach(array5, add250);
   keke_array_qsort_header(array5, sizeof(uint64_t));
-	printf("Expected value:\n250, 251, 251, 252, 252, 252, 252, 253, 253, 253, 254, 255, 256, 257, 258, 259,\n");
+  printf("Expected value:\n250, 251, 251, 252, 252, 252, 252, 253, 253, 253, "
+         "254, 255, 256, 257, 258, 259,\n");
   keke_array_foreach(array5, output);
   puts("\n");
 

test_symbol.c

@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include "libkeke_symbol.h"
+#include <stdio.h>
 
 int main(void) {
   KekeSymbol s = keke_new_symbol();