shadps4-emu/ext-cryptopp
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-cryptopp.git synced 2025-02-21 13:53:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Explicitly add space on line continuation

Browse Source 
Formatting of data for a failed self test was still off a bit. It was due to retaining a whitespace character from the test vector file. The problem was, the whitespace was a tab on occasion.
This commit is contained in:
Jeffrey Walton 2017-05-14 02:41:22 -04:00
parent bc2678478c
commit 2c570e27a0
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
datatest.cpp
View File

@ -706,6 +706,10 @@ bool GetField(std::istream &is, std::string &name, std::string &value)
if (line[line.size() - 1] == '\\') {
continueLine = true;
}
// Check for comment. It can be first character
if (line[0] == '#') {
continue;
}
}
// Leading, trailing and temp position. The leading position moves right, and
@ -713,36 +717,22 @@ bool GetField(std::istream &is, std::string &name, std::string &value)
// the name. We leave one space when line continuation is in effect, (and if
// present). The value can be an empty string. One Plaintext value is often
// empty for algorithm testing.
std::string::size_type l, t, p;
std::string::size_type l=0, t=std::string::npos;
const std::string whitespace = " \r\n\t\v\f";
l = line.find_first_not_of(whitespace);
l = line.find_first_not_of(whitespace, l);
if (l == std::string::npos) { l = 0; }
t = line.find_last_not_of(whitespace+"\\");
if (l == std::string::npos) { t = line.size(); }
t = line.find('#', l);
if (t != std::string::npos) { t--; }
// Chop comment. Perform after setting continueLine
p = line.find('#', l);
if (p < t) {
t = p;
if (t) t--;
}
// Leave one whitespace if line continuation is in effect
if (continueLine)
{
if (l > 0 && ::isspace(line[l - 1]))
{
l--;
}
else if (t < line.size()-1 && ::isspace(line[t + 1]))
{
t++;
}
}
t = line.find_last_not_of(whitespace+"\\", t);
if (t != std::string::npos) { t++; }
CRYPTOPP_ASSERT(t >= l);
value += line.substr(l, t - l + 1);
value += line.substr(l, t - l);
if (continueLine)
value.append(1, ' ');
}
return true;