Refactor to use RCUTILS_PATH_DELIMITER

ros2 · Sep 19, 2018 · 7319110 · 7319110
1 parent 95ad53f
commit 7319110
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/src/filesystem.c b/src/filesystem.c
@@ -31,6 +31,12 @@ extern "C"
 #include "rcutils/format_string.h"
 #include "rcutils/repl_str.h"
 
+#ifdef  _WIN32
+# define RCUTILS_PATH_DELIMITER "\\"
+#else
+# define RCUTILS_PATH_DELIMITER "/"
+#endif  // _WIN32
+
 bool
 rcutils_get_cwd(char * buffer, size_t max_length)
 {
@@ -153,13 +159,7 @@ rcutils_join_path(
     return NULL;
   }
 
-#ifdef  _WIN32
-  const char * delimiter = "\\";
-#else
-  const char * delimiter = "/";
-#endif  // _WIN32
-
-  return rcutils_format_string(allocator, "%s%s%s", left_hand_path, delimiter, right_hand_path);
+  return rcutils_format_string(allocator, "%s%s%s", left_hand_path, RCUTILS_PATH_DELIMITER, right_hand_path);
 }
 
 char *
@@ -171,13 +171,7 @@ rcutils_norm_path(
     return NULL;
   }
 
-#ifdef  _WIN32
-  const char * delimiter = "\\";
-#else
-  const char * delimiter = "/";
-#endif  // _WIN32
-
-  return rcutils_repl_str(path, "/", delimiter, &allocator);
+  return rcutils_repl_str(path, "/", RCUTILS_PATH_DELIMITER, &allocator);
 }
 
 #ifdef __cplusplus