Mark private/static functions

Author: ddoroshev

Makefile

@@ -29,7 +29,7 @@ $(TARGET): $(OBJS) $(MAIN_OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
 
 .PHONY: test-build
-test-build: CFLAGS += -Wno-implicit-function-declaration -g
+test-build: CFLAGS += -DUNIT_TEST -Wno-implicit-function-declaration -g
 test-build: $(TESTS_TARGET)
 
 .PHONY: test
@@ -100,12 +100,18 @@ valgrind:
 
 .PHONY: check
 check:
-	cppcheck --enable=all --inline-suppr --check-level=exhaustive \
-			 --suppress=missingIncludeSystem \
-			 --suppress=constParameterPointer \
-			 --suppress=constVariablePointer \
-			 --suppress=variableScope \
-			 .
+	cppcheck \
+		--language=c \
+		-UUNIT_TEST \
+		--safety \
+		--inline-suppr \
+		--enable=all \
+		--check-level=exhaustive \
+		--suppress=missingIncludeSystem \
+		--suppress=constParameterPointer \
+		--suppress=constVariablePointer \
+		--suppress=variableScope \
+		.
 
 .PHONY: clean
 clean:

hashmap.c

@@ -5,10 +5,12 @@
 
 #include "alloc.h"
 #include "hashmap.h"
+#include "private.h"
 
-static int hashmap_ensure_size(hashmap *hm);
-static int hashmap_resize(hashmap *hm);
-static uint32_t _hashmap_find_empty_index(hashmap *hm, uint32_t hash);
+private int hashmap_ensure_size(hashmap *hm);
+private int hashmap_resize(hashmap *hm);
+private uint32_t _hashmap_find_empty_index(hashmap *hm, uint32_t hash);
+private int32_t _hashmap_find_index(hashmap *hm, char *key, uint32_t hash);
 
 /**
  * Allocate and initialize a new hashmap with default capacity
@@ -167,7 +169,7 @@ int hashmap_set(hashmap *hm, char *key, int value)
  *
  * Return: 0 on success, error code on failure
  */
-static int hashmap_ensure_size(hashmap *hm)
+private int hashmap_ensure_size(hashmap *hm)
 {
     int result;
     if (hm->count >= USABLE_FRACTION(hm->length)) {
@@ -188,7 +190,7 @@ static int hashmap_ensure_size(hashmap *hm)
  *
  * Return: 0 on success, error code on failure
  */
-static int hashmap_resize(hashmap *hm)
+private int hashmap_resize(hashmap *hm)
 {
     hashmap_item *item;
     hashmap_item **old_items = hm->items;
@@ -299,7 +301,7 @@ hashmap_item *hashmap_get(hashmap *hm, char *key)
  *
  * Return: Non-negative index if found, -E_HASHMAP_KEY_NOT_FOUND if not found
  */
-int32_t _hashmap_find_index(hashmap *hm, char *key, uint32_t hash)
+private int32_t _hashmap_find_index(hashmap *hm, char *key, uint32_t hash)
 {
     uint32_t mask = hm->length - 1;
     uint32_t i = hash & mask;
@@ -336,7 +338,7 @@ int32_t _hashmap_find_index(hashmap *hm, char *key, uint32_t hash)
  *
  * Return: Index of empty/deleted slot, or -E_HASHMAP_KEY_NOT_FOUND if table is full
  */
-static uint32_t _hashmap_find_empty_index(hashmap *hm, uint32_t hash)
+private uint32_t _hashmap_find_empty_index(hashmap *hm, uint32_t hash)
 {
     uint32_t mask = hm->length - 1;
     uint32_t i = hash & mask;

hashmap.h

@@ -37,5 +37,4 @@ uint32_t hashmap_get_length(hashmap *hm);
 int hashmap_set(hashmap*, char *key, int value);
 hashmap_item *hashmap_get(hashmap *hm, char *key);
 int hashmap_delete(hashmap *hm, char *key);
-int32_t _hashmap_find_index(hashmap *hm, char *key, uint32_t hash);
 unsigned long hash(char *s);

private.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#ifdef UNIT_TEST
+# define private
+#else
+# define private static
+#endif