Fix warnings and tests

matt-attack · Feb 15, 2025 · 016014b · 016014b
1 parent 6009673
commit 016014b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/include/pubsub_cpp/array_vector.h b/include/pubsub_cpp/array_vector.h
@@ -68,7 +68,7 @@ class ArrayVector
 
 		length_ = arr.size();
 		data_ = (T*)malloc(sizeof(T)*length_);
-		for (int i = 0; i < length_; i++)
+		for (uint32_t i = 0; i < length_; i++)
 		{
 			data_[i] = arr[i];
 		}
@@ -82,7 +82,7 @@ class ArrayVector
 
 		auto new_data = (T*)malloc(sizeof(T)*size);
 		auto copy_len = std::min(size, length_);
-		for (int i = 0; i < copy_len; i++)
+		for (uint32_t i = 0; i < copy_len; i++)
 		{
 			new_data[i] = data_[i];
 		}

diff --git a/tests/test_pubsub_c.cpp b/tests/test_pubsub_c.cpp
@@ -50,7 +50,7 @@ TEST(test_publish_subscribe_generic, []() {
 
   static bool got_message = false;
   //options.preferred_transport = tcp ? 1 : 0;
-  options.cb = [](void* message, unsigned int size, void* data2, const ps_msg_info_t* info)
+  options.cb_raw = [](void* message, unsigned int size, void* data2, const ps_msg_info_t* info)
   {
     got_message = true;
     // todo need to also assert we have the message type
@@ -60,6 +60,8 @@ TEST(test_publish_subscribe_generic, []() {
     EXPECT(strcmp(data->value, rmsg.value) == 0);
     free(data->value);
     free(data);
+
+    free(message);
   };
   ps_node_create_subscriber_adv(&node, "/data", 0, &string_sub, &options);
 
@@ -169,7 +171,7 @@ TEST(test_publish_subscribe_large, []() {
 
   static bool got_message = false;
   options.preferred_transport = 1;
-  options.cb = [](void* message, unsigned int size, void* data2, const ps_msg_info_t* info)
+  options.cb_raw = [](void* message, unsigned int size, void* data2, const ps_msg_info_t* info)
   {
     got_message = true;
     printf("Got message\n");
@@ -180,6 +182,7 @@ TEST(test_publish_subscribe_large, []() {
     EXPECT(data->num_points == rmsg.num_points);
     free(data->data);
     free(data);
+    free(message);
   };
   ps_node_create_subscriber_adv(&node, "/data", 0, &string_sub, &options);