Skip to content

Trim whitespace around the items of a comma-separated tag value #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bercedev wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Trim whitespace around the items of a comma-separated tag value #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions FECore/XMLReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,27 +206,30 @@ int XMLTag::value(int* pi, int n)
return nr;
}

//-----------------------------------------------------------------------------
// An item of a comma-separated list, from sz up to sze (or the end of the
// string when sze is null), without the whitespace around it. So "a, b" lists
// "a" and "b", not "a" and " b".
static std::string listItem(const char* sz, const char* sze)
{
std::string s = (sze ? std::string(sz, sze - sz) : std::string(sz));
size_t n0 = s.find_first_not_of(" \t\r\n");
if (n0 == std::string::npos) return std::string();
size_t n1 = s.find_last_not_of(" \t\r\n");
return s.substr(n0, n1 - n0 + 1);
}

//-----------------------------------------------------------------------------
int XMLTag::value(std::vector<std::string>& stringList, int n)
{
stringList.clear();

char tmp[256] = { 0 };

const char* sz = m_szval.c_str();
int nr = 0;
for (int i = 0; i<n; ++i)
{
const char* sze = strchr(sz, ',');
if (sze)
{
int l = (int)(sze - sz);
if (l > 0) strncpy(tmp, sz, l);
tmp[l] = 0;

stringList.push_back(tmp);
}
else stringList.push_back(sz);
stringList.push_back(listItem(sz, sze));
nr++;

if (sze) sz = sze + 1;
Expand All @@ -240,21 +243,11 @@ void XMLTag::value(std::vector<std::string>& stringList)
{
stringList.clear();

char tmp[256] = { 0 };

const char* sz = m_szval.c_str();
while (sz && *sz)
{
const char* sze = strchr(sz, ',');
if (sze)
{
int l = (int)(sze - sz);
if (l > 0) strncpy(tmp, sz, l);
tmp[l] = 0;

stringList.push_back(tmp);
}
else stringList.push_back(sz);
stringList.push_back(listItem(sz, sze));

if (sze) sz = sze + 1;
else break;
Expand Down
Loading