pk.h: -Wextra + clang compiler warnings

9 files changed, 43 insertions, 38 deletions

diff --git a/config.mk b/config.mk
index 21bacef..59eb75d 100644
--- a/config.mk
+++ b/config.mk
@@ -23,8 +23,8 @@ SHARED_FLAGS = -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L \
  -DPK_IMPL_ARR \
  -DPK_IMPL_STN \
 
-CFLAGS       += -Wall -pedantic $(INCS) $(SHARED_FLAGS)
-CXXFLAGS     += -Wall -pedantic $(INCS) $(SHARED_FLAGS)
+CFLAGS       += -Wall -Wextra -pedantic $(INCS) $(SHARED_FLAGS)
+CXXFLAGS     += -Wall -Wextra -pedantic $(INCS) $(SHARED_FLAGS)
 LDFLAGS      =  $(LIBS)
 
 # compiler and linker
diff --git a/pkev.h b/pkev.h
index 0290fbe..4f97c48 100644
--- a/pkev.h
+++ b/pkev.h
@@ -11,12 +11,12 @@ void pk_ev_init();
 // note: pk_ev_teardown() is NOT thread-safe
 void pk_ev_teardown();
 
-const pk_ev_mgr_id_T pk_ev_create_mgr();
+pk_ev_mgr_id_T pk_ev_create_mgr();
 void pk_ev_destroy_mgr(pk_ev_mgr_id_T evmgr);
 
 typedef void (pk_ev_cb_fn)(void *user_event_data, void *user_cb_data, void *user_ev_data);
 
-const pk_ev_id_T pk_ev_register_ev(pk_ev_mgr_id_T evmgr, void *user_ev_data);
+pk_ev_id_T pk_ev_register_ev(pk_ev_mgr_id_T evmgr, void *user_ev_data);
 bool pk_ev_register_cb(pk_ev_mgr_id_T evmgr, pk_ev_id_T evid, pk_ev_cb_fn *cb, void *user_cb_data);
 void pk_ev_emit(pk_ev_mgr_id_T evmgr, pk_ev_id_T evid, void *user_emit_data);
 
@@ -153,7 +153,7 @@ pk_ev_inner_ev_mgr_clone(struct pk_ev_mgr *old, struct pk_ev_mgr *mgr)
 	}
 }
 
-const pk_ev_mgr_id_T
+pk_ev_mgr_id_T
 pk_ev_create_mgr()
 {
 	uint64_t i;
@@ -196,7 +196,7 @@ pk_ev_destroy_mgr(pk_ev_mgr_id_T evmgr)
 	mtx_unlock(&pk_ev_mstr.mtxs[evmgr]);
 }
 
-const pk_ev_id_T
+pk_ev_id_T
 pk_ev_register_ev(pk_ev_mgr_id_T evmgr, void *user_ev_data)
 {
 	assert(evmgr < 64);
diff --git a/test/pkarr.cpp b/test/pkarr.cpp
index 306dd51..caed839 100644
--- a/test/pkarr.cpp
+++ b/test/pkarr.cpp
@@ -23,8 +23,8 @@ int main(int argc, char *argv[])
 {
 	(void)argc;
 	(void)argv;
-	struct pk_arr arr = {0};
-	struct pk_membucket *bkt = {0};
+	struct pk_arr arr = {};
+	struct pk_membucket *bkt = {};
 
 	/* template
 	{
diff --git a/test/pkev.c b/test/pkev.c
index 55c3f85..10d82b0 100644
--- a/test/pkev.c
+++ b/test/pkev.c
@@ -40,7 +40,7 @@ thrd_ev_emit_two(void *)
 	return 0;
 }
 
-const pk_ev_mgr_id_T
+pk_ev_mgr_id_T
 test_setup()
 {
 	memset(&ev_one, 0, sizeof(struct ev));
diff --git a/test/pkev.cpp b/test/pkev.cpp
index dd227ce..6258e02 100644
--- a/test/pkev.cpp
+++ b/test/pkev.cpp
@@ -31,10 +31,10 @@ struct ev {
 	bool handled;
 };
 
-struct ev ev_one = {0};
-struct ev ev_two = {0};
+struct ev ev_one = {};
+struct ev ev_two = {};
 
-const pk_ev_mgr_id_T
+pk_ev_mgr_id_T
 test_setup()
 {
 	memset(&ev_one, 0, sizeof(struct ev));
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
 	{
 		const uint64_t cb_count = PK_EV_INIT_CB_COUNT + 2;
 		const uint64_t ev_count = PK_EV_INIT_EV_COUNT + 2;
-		struct ev evs[ev_count] = {{0}};
+		struct ev evs[ev_count] = {};
 		const pk_ev_mgr_id_T evmgr = test_setup();
 		for (i = 0; i < ev_count; ++i) {
 			evs[i].evmgr = evmgr;
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
 	{
 		const uint64_t cb_count = 255;
 		const uint64_t ev_count = 255;
-		struct ev evs[ev_count] = {{0}};
+		struct ev evs[ev_count] = {};
 		const pk_ev_mgr_id_T evmgr = test_setup();
 		for (i = 0; i < ev_count; ++i) {
 			evs[i].evmgr = evmgr;
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
 		int r;
 		const uint64_t cb_count = 256;
 		const uint64_t ev_count = 1;
-		struct ev evs[ev_count] = {{0}};
+		struct ev evs[ev_count] = {};
 		const pk_ev_mgr_id_T evmgr = test_setup();
 
 		r = setjmp(jmp_env);
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
 		int r;
 		const uint64_t cb_count = 1;
 		const uint64_t ev_count = 256;
-		struct ev evs[ev_count] = {{0}};
+		struct ev evs[ev_count] = {};
 		const pk_ev_mgr_id_T evmgr = test_setup();
 
 		r = setjmp(jmp_env);
diff --git a/test/pkmem.c b/test/pkmem.c
index 2073459..024561d 100644
--- a/test/pkmem.c
+++ b/test/pkmem.c
@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
 	{
 		spinup();
 		char *some_dang_string = (char*)pk_new_base(64, alignof(char*));
-		fprintf(stdout, "some_dang_string: %p\n", some_dang_string);
+		fprintf(stdout, "some_dang_string: %s: %p\n", some_dang_string, (void *)some_dang_string);
 		pk_delete_base(some_dang_string, 64);
 		teardown();
 	}
diff --git a/test/pkmem.cpp b/test/pkmem.cpp
index 57ae2c4..2e3b6f2 100644
--- a/test/pkmem.cpp
+++ b/test/pkmem.cpp
@@ -128,6 +128,7 @@ exit(int code)
 void
 handle_assert_abort(int sig)
 {
+	(void)sig;
 	if (expected_exit) {
 		caught = true;
 		longjmp(jmp_env, 1);
@@ -146,7 +147,7 @@ int main(int argc, char *argv[])
 	// pk_new<T>
 	{
 		char *some_dang_string = pk_new<char>(64);
-		fprintf(stdout, "some_dang_string: %p\n", some_dang_string);
+		fprintf(stdout, "some_dang_string: %s: %p\n", some_dang_string, (void *)some_dang_string);
 		pk_delete<char>(some_dang_string, 64);
 	}
 	pk_memory_teardown_all();
@@ -165,7 +166,7 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "head               : %li\n", bkt->head);
 		assert(65 == bkt->head);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)bkt->blocks[0].data);
 		assert(bkt->ptr + 10 == bkt->blocks[0].data);
 
 		fprintf(stdout, "blocks[0].size     : %li\n", bkt->blocks[0].size);
@@ -188,13 +189,13 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "head               : %li\n", bkt->head);
 		assert(65 == bkt->head);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)bkt->blocks[0].data);
 		assert(bkt->ptr + 1 == bkt->blocks[0].data);
 
 		fprintf(stdout, "blocks[0].size     : %li\n", bkt->blocks[0].size);
 		assert(15 == bkt->blocks[0].size);
 
-		fprintf(stdout, "blocks[1].data     : %p\n", bkt->blocks[1].data);
+		fprintf(stdout, "blocks[1].data     : %p\n", (void *)bkt->blocks[1].data);
 		assert(bkt->ptr + 25 == bkt->blocks[1].data);
 
 		fprintf(stdout, "blocks[1].size     : %li\n", bkt->blocks[1].size);
@@ -209,17 +210,17 @@ int main(int argc, char *argv[])
 		FreeTest01 ft{};
 		ft.ensureState();
 
-		fprintf(stdout, "blocks[0].data     : %p\n", ft.bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)ft.bkt->blocks[0].data);
 		assert(ft.bkt->ptr + 2 == ft.bkt->blocks[0].data);
 		fprintf(stdout, "blocks[0].size     : %li\n", ft.bkt->blocks[0].size);
 		assert(6 == ft.bkt->blocks[0].size);
 
-		fprintf(stdout, "blocks[1].data     : %p\n", ft.bkt->blocks[1].data);
+		fprintf(stdout, "blocks[1].data     : %p\n", (void *)ft.bkt->blocks[1].data);
 		assert(ft.bkt->ptr + 12 == ft.bkt->blocks[1].data);
 		fprintf(stdout, "blocks[1].size     : %li\n", ft.bkt->blocks[1].size);
 		assert(4 == ft.bkt->blocks[1].size);
 
-		fprintf(stdout, "blocks[2].data     : %p\n", ft.bkt->blocks[2].data);
+		fprintf(stdout, "blocks[2].data     : %p\n", (void *)ft.bkt->blocks[2].data);
 		assert(ft.bkt->ptr + 32 == ft.bkt->blocks[2].data);
 		fprintf(stdout, "blocks[2].size     : %li\n", ft.bkt->blocks[2].size);
 		assert(32 == ft.bkt->blocks[2].size);
@@ -245,17 +246,17 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "head               : %li\n", ft.bkt->head);
 		assert(expected_head == ft.bkt->head);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", ft.bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)ft.bkt->blocks[0].data);
 		assert(ft.bkt->ptr + 0 == ft.bkt->blocks[0].data);
 		fprintf(stdout, "blocks[0].size     : %li\n", ft.bkt->blocks[0].size);
 		assert(8 == ft.bkt->blocks[0].size);
 
-		fprintf(stdout, "blocks[1].data     : %p\n", ft.bkt->blocks[1].data);
+		fprintf(stdout, "blocks[1].data     : %p\n", (void *)ft.bkt->blocks[1].data);
 		assert(ft.bkt->ptr + 12 == ft.bkt->blocks[1].data);
 		fprintf(stdout, "blocks[1].size     : %li\n", ft.bkt->blocks[1].size);
 		assert(4 == ft.bkt->blocks[1].size);
 
-		fprintf(stdout, "blocks[2].data     : %p\n", ft.bkt->blocks[2].data);
+		fprintf(stdout, "blocks[2].data     : %p\n", (void *)ft.bkt->blocks[2].data);
 		assert(ft.bkt->ptr + 32 == ft.bkt->blocks[2].data);
 		fprintf(stdout, "blocks[2].size     : %li\n", ft.bkt->blocks[2].size);
 		assert(32 == ft.bkt->blocks[2].size);
@@ -281,12 +282,12 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "head               : %li\n", ft.bkt->head);
 		assert(expected_head == ft.bkt->head);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", ft.bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)ft.bkt->blocks[0].data);
 		assert(ft.bkt->ptr + 2 == ft.bkt->blocks[0].data);
 		fprintf(stdout, "blocks[0].size     : %li\n", ft.bkt->blocks[0].size);
 		assert(6 == ft.bkt->blocks[0].size);
 
-		fprintf(stdout, "blocks[1].data     : %p\n", ft.bkt->blocks[1].data);
+		fprintf(stdout, "blocks[1].data     : %p\n", (void *)ft.bkt->blocks[1].data);
 		assert(ft.bkt->ptr + 12 == ft.bkt->blocks[1].data);
 		fprintf(stdout, "blocks[1].size     : %li\n", ft.bkt->blocks[1].size);
 		assert(4 == ft.bkt->blocks[1].size);
@@ -313,12 +314,12 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "head               : %li\n", ft.bkt->head);
 		assert(expected_head == ft.bkt->head);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", ft.bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)ft.bkt->blocks[0].data);
 		assert(ft.bkt->ptr + 2 == ft.bkt->blocks[0].data);
 		fprintf(stdout, "blocks[0].size     : %li\n", ft.bkt->blocks[0].size);
 		assert(6 == ft.bkt->blocks[0].size);
 
-		fprintf(stdout, "blocks[1].data     : %p\n", ft.bkt->blocks[1].data);
+		fprintf(stdout, "blocks[1].data     : %p\n", (void *)ft.bkt->blocks[1].data);
 		assert(ft.bkt->ptr + 12 == ft.bkt->blocks[1].data);
 		fprintf(stdout, "blocks[1].size     : %li\n", ft.bkt->blocks[1].size);
 		assert(52 == ft.bkt->blocks[1].size);
@@ -345,12 +346,12 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "head               : %li\n", ft.bkt->head);
 		assert(expected_head == ft.bkt->head);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", ft.bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)ft.bkt->blocks[0].data);
 		assert(ft.bkt->ptr + 2 == ft.bkt->blocks[0].data);
 		fprintf(stdout, "blocks[0].size     : %li\n", ft.bkt->blocks[0].size);
 		assert(14 == ft.bkt->blocks[0].size);
 
-		fprintf(stdout, "blocks[1].data     : %p\n", ft.bkt->blocks[1].data);
+		fprintf(stdout, "blocks[1].data     : %p\n", (void *)ft.bkt->blocks[1].data);
 		assert(ft.bkt->ptr + 32 == ft.bkt->blocks[1].data);
 		fprintf(stdout, "blocks[1].size     : %li\n", ft.bkt->blocks[1].size);
 		assert(32 == ft.bkt->blocks[1].size);
@@ -373,12 +374,12 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "head               : %li\n", ft.bkt->head);
 		assert(65 == ft.bkt->head);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", ft.bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)ft.bkt->blocks[0].data);
 		assert(ft.bkt->ptr + 0 == ft.bkt->blocks[0].data);
 		fprintf(stdout, "blocks[0].size     : %li\n", ft.bkt->blocks[0].size);
 		assert(32 == ft.bkt->blocks[0].size);
 
-		fprintf(stdout, "blocks[1].data     : %p\n", ft.bkt->blocks[1].data);
+		fprintf(stdout, "blocks[1].data     : %p\n", (void *)ft.bkt->blocks[1].data);
 		assert(ft.bkt->ptr + 33 == ft.bkt->blocks[1].data);
 		fprintf(stdout, "blocks[1].size     : %li\n", ft.bkt->blocks[1].size);
 		assert(31 == ft.bkt->blocks[1].size);
@@ -453,7 +454,7 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "ptr5               : %p\n", ptr5);
 		assert(ft.bkt->ptr + 65 == ptr5);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", ft.bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)ft.bkt->blocks[0].data);
 		assert(ft.bkt->ptr + 19 == ft.bkt->blocks[0].data);
 		fprintf(stdout, "blocks[0].size     : %li\n", ft.bkt->blocks[0].size);
 		assert(13 == ft.bkt->blocks[0].size);
@@ -483,7 +484,7 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "ptr5               : %p\n", ptr5);
 		assert(ft.bkt->ptr + 65 == ptr5);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", ft.bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)ft.bkt->blocks[0].data);
 		assert(ft.bkt->ptr + 19 == ft.bkt->blocks[0].data);
 		fprintf(stdout, "blocks[0].size     : %li\n", ft.bkt->blocks[0].size);
 		assert(14 == ft.bkt->blocks[0].size);
@@ -514,7 +515,7 @@ int main(int argc, char *argv[])
 		fprintf(stdout, "ptr1               : %p\n", ft.ptrs[1]);
 		assert(ft.bkt->ptr + 64 == ft.ptrs[1]);
 
-		fprintf(stdout, "blocks[0].data     : %p\n", ft.bkt->blocks[0].data);
+		fprintf(stdout, "blocks[0].data     : %p\n", (void *)ft.bkt->blocks[0].data);
 		assert(ft.bkt->ptr + 19 == ft.bkt->blocks[0].data);
 		fprintf(stdout, "blocks[0].size     : %li\n", ft.bkt->blocks[0].size);
 		assert(45 == ft.bkt->blocks[0].size);
diff --git a/test/pktmr.c b/test/pktmr.c
index 5237415..8708891 100644
--- a/test/pktmr.c
+++ b/test/pktmr.c
@@ -11,6 +11,8 @@ int main(int argc, char *argv[])
 	uint64_t asdf;
 	(void)asdf;
 	(void)stdout;
+	(void)argc;
+	(void)argv;
 
 	// timer
 	{
diff --git a/test/pktmr.cpp b/test/pktmr.cpp
index 1a5894f..899b421 100644
--- a/test/pktmr.cpp
+++ b/test/pktmr.cpp
@@ -11,6 +11,8 @@ int main(int argc, char *argv[])
 	uint64_t asdf;
 	(void)asdf;
 	(void)stdout;
+	(void)argc;
+	(void)argv;
 
 	// timer
 	{