Separate error messages for null vs empty

Signed-off-by: Jacob Perron <[email protected]>
ros2 · Mar 12, 2020 · 922f2e8 · 922f2e8
1 parent f8589d9
commit 922f2e8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/rcl/src/rcl/graph.c b/rcl/src/rcl/graph.c
@@ -343,8 +343,12 @@ rcl_get_node_names(
 
   // Check that none of the node names are NULL or empty
   for (size_t i = 0u; i < node_names->size; ++i) {
-    if (!node_names->data[i] || !strcmp(node_names->data[i], "")) {
-      RCL_SET_ERROR_MSG("NULL or empty node name returned by the RMW layer");
+    if (!node_names->data[i]) {
+      RCL_SET_ERROR_MSG("NULL node name returned by the RMW layer");
+      return RCL_RET_ERROR;
+    }
+    if (!strcmp(node_names->data[i], "")) {
+      RCL_SET_ERROR_MSG("empty node name returned by the RMW layer");
       return RCL_RET_ERROR;
     }
   }