rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-06-09 23:16:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add a path str. Remove the duplicate split call.

Browse Source
This commit is contained in:
Chris Johns 2014-09-06 20:17:56 +10:00
parent b233be7a3f
commit a72a9e357d
2 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
linkers/rld.cpp
View File

@ -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)
{

19
linkers/rld.h
View File

@ -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.
*/