From 3eb00648c06a63504d2bca0028075dff2715d5e1 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Sat, 6 Sep 2014 20:17:56 +1000 Subject: Add a path str. Remove the duplicate split call. --- rld.cpp | 18 ------------------ rld.h | 19 ++++++++----------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/rld.cpp b/rld.cpp index 997291d..a239ddc 100644 --- a/rld.cpp +++ b/rld.cpp @@ -92,24 +92,6 @@ namespace rld return rld::to_string (RTEMS_VERSION); } - void - split (const std::string& str, strings& strs, char separator) - { - if (str.size ()) - { - std::string::size_type start = 0; - std::string::size_type end = 0; - while (start != std::string::npos) - { - end = str.find_first_of (separator, start); - if (end == std::string::npos) - end = str.size (); - strs.push_back (str.substr (start, end - start)); - start = str.find_first_not_of (separator, end); - } - } - } - void map (rld::files::cache& cache, rld::symbols::table& symbols) { diff --git a/rld.h b/rld.h index efe3f46..2c5fdd2 100644 --- a/rld.h +++ b/rld.h @@ -38,12 +38,14 @@ */ #if __WIN32__ #define RLD_PATH_SEPARATOR '\\' +#define RLD_PATH_SEPARATOR_STR "\\" #define RLD_PATHSTR_SEPARATOR ';' #define RLD_PATHSTR_SEPARATOR_STR ";" #define RLD_DRIVE_SEPARATOR (1) #define RLD_LINE_SEPARATOR "\r\n" #else #define RLD_PATH_SEPARATOR '/' +#define RLD_PATH_SEPARATOR_STR "/" #define RLD_PATHSTR_SEPARATOR ':' #define RLD_PATHSTR_SEPARATOR_STR ":" #define RLD_DRIVE_SEPARATOR (0) @@ -201,12 +203,12 @@ namespace rld * * @todo The split should optionally honour string quoting. */ - inline strings& split (strings& se, - const std::string& s, - char delimiter = ' ', - bool strip_quotes = true, - bool strip_whitespace = true, - bool empty = false) + inline strings split (strings& se, + const std::string& s, + char delimiter = ' ', + bool strip_quotes = true, + bool strip_whitespace = true, + bool empty = false) { std::stringstream ss(s); std::string e; @@ -279,11 +281,6 @@ namespace rld */ typedef std::vector < std::string > strings; - /** - * Split a string into strings by the separator. - */ - void split (const std::string& str, strings& strs, char separator); - /** * Map of the symbol table. */ -- cgit v1.2.3