Fix tricky issue on windows

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
ros2 · Dec 5, 2024 · b621ac7 · b621ac7
1 parent ae44d68
commit b621ac7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rmw_zenoh_cpp/src/detail/attachment_helpers.cpp b/rmw_zenoh_cpp/src/detail/attachment_helpers.cpp
@@ -78,7 +78,7 @@ int64_t get_int64_from_attachment(
 
   errno = 0;
   char * endptr;
-  int64_t num = strtol(int64_str, &endptr, 10);
+  int64_t num = std::strtoll(int64_str, &endptr, 10);
   if (num == 0) {
     // This is an error regardless; the client should never send this
     return -1;

diff --git a/rmw_zenoh_cpp/src/detail/rmw_service_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_service_data.cpp
@@ -331,14 +331,14 @@ rmw_ret_t ServiceData::take_request(
   request_header->request_id.sequence_number =
     get_int64_from_attachment(&attachment, "sequence_number");
   if (request_header->request_id.sequence_number < 0) {
-    RMW_SET_ERROR_MSG("Failed to get sequence_number from client call attachment");
+    RMW_SET_ERROR_MSG("Failed to get sequence_number from service call attachment");
     return RMW_RET_ERROR;
   }
   request_header->source_timestamp = get_int64_from_attachment(
     &attachment,
     "source_timestamp");
   if (request_header->source_timestamp < 0) {
-    RMW_SET_ERROR_MSG("Failed to get source_timestamp from client call attachment");
+    RMW_SET_ERROR_MSG("Failed to get source_timestamp from service call attachment");
     return RMW_RET_ERROR;
   }
   if (!get_gid_from_attachment(