Merge pull request #168 from ros2/avoid_compiler_warning

Avoid unused return value warning
ros2 · Dec 4, 2015 · 67dcd9f · 67dcd9f
2 parents 13d36a1 + f0fd292
commit 67dcd9f
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/rclcpp/src/rclcpp/utilities.cpp b/rclcpp/src/rclcpp/utilities.cpp
@@ -117,7 +117,18 @@ rclcpp::utilities::init(int argc, char * argv[])
     // NOLINTNEXTLINE(runtime/arrays)
     char error_string[error_length];
 #ifndef _WIN32
-    strerror_r(errno, error_string, error_length);
+#ifdef _GNU_SOURCE
+    char * msg = strerror_r(errno, error_string, error_length);
+    if (msg != error_string) {
+      strncpy(error_string, msg, error_length);
+      msg[error_length - 1] = '\0';
+    }
+#else
+    int error_status = strerror_r(errno, error_string, error_length);
+    if (error_status != 0) {
+      throw std::runtime_error("Failed to get error string for errno: " + std::to_string(errno));
+    }
+#endif
 #else
     strerror_s(error_string, error_length, errno);
 #endif