pk.h: handle gcc compiler warnings; breaking changes

1 files changed, 9 insertions, 9 deletions

diff --git a/test/pkev.cpp b/test/pkev.cpp
index 652f020..dd227ce 100644
--- a/test/pkev.cpp
+++ b/test/pkev.cpp
@@ -50,13 +50,13 @@ test_setup()
 	return evmgr;
 }
 
-struct cb_data {
+typedef struct cb_data {
 	int i;
 	struct ev *ev;
-};
+} cb_data;
 
 void stress_cb(void *, void *, void *user_data) {
-	struct cb_data *data = reinterpret_cast<struct cb_data*>(user_data);
+	cb_data *data = reinterpret_cast<cb_data*>(user_data);
 	data->ev[data->i].handled = true;
 	data->ev[data->i].count += 1;
 }
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 	(void)argc;
 	(void)argv;
 	(void)stdout;
-	int i, ii;
+	size_t i, ii;
 
 
 	// register, emit, catch
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 		pk_ev_register_cb(evmgr, ev_two.evid, &invoke_packged_task, NULL);
 		pk_ev_emit(evmgr, ev_one.evid, &handle_ev_one);
 		pk_ev_emit(evmgr, ev_two.evid, &handle_ev_two);
-		PK_LOGV_INF("%s: ev_one: %b, ev_two: %b\n", __FILE__, ev_one.handled, ev_two.handled);
+		PK_LOGV_INF("%s: ev_one: %s, ev_two: %s\n", __FILE__, ev_one.handled ? "true" : "false", ev_two.handled ? "true" : "false");
 		pk_ev_teardown();
 		fflush(stdout);
 		fflush(stderr);
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
 		auto t2 = std::thread([&handle_ev_two]() { pk_ev_emit(ev_two.evmgr, ev_two.evid, &handle_ev_two); });
 		t1.join();
 		t2.join();
-		PK_LOGV_INF("%s: ev_one: %b, ev_two: %b\n", __FILE__, ev_one.handled, ev_two.handled);
+		PK_LOGV_INF("%s: ev_one: %s, ev_two: %s\n", __FILE__, ev_one.handled ? "true" : "false", ev_two.handled ? "true" : "false");
 		pk_ev_teardown();
 		fflush(stdout);
 		fflush(stderr);
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
 		}
 
 		for (i = 0; i < ev_count; ++i) {
-			struct cb_data *d = new struct cb_data{};
+			cb_data *d = new cb_data{};
 			d->ev = evs;
 			d->i = i;
 			pk_ev_emit(evs[i].evmgr, evs[i].evid, d);
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
 
 		bool any_false = false;
 		for (i = 0; i < ev_count; ++i) {
-			PK_LOGV_INF("%s: ev# %.2i: %b, called count: %i\n", __FILE__, i, evs[i].handled, evs[i].count);
+			PK_LOGV_INF("%s: ev# %.2zu: %s, called count: %i\n", __FILE__, i, evs[i].handled ? "true" : "false", evs[i].count);
 			any_false = any_false || !evs[i].handled;
 		}
 		pk_ev_teardown();
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
 		}
 
 		for (i = 0; i < ev_count; ++i) {
-			struct cb_data *d = new struct cb_data{};
+			cb_data *d = new cb_data{};
 			d->ev = evs;
 			d->i = i;
 			pk_ev_emit(evs[i].evmgr, evs[i].evid, d);