smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename split argument from `trimEmpty` to `dropEmpty`.

This commit is contained in:
Matthieu Gautier 2021-07-06 15:45:46 +02:00
parent 18b6433322
commit 0b6b6716de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/tools.h
View File

@ -155,7 +155,7 @@ void sleep(unsigned int milliseconds);
* @param keepDelim true if delimiter must be included from the result. * @param keepDelim true if delimiter must be included from the result.
* @return a list of part (potentially containing delimiters) * @return a list of part (potentially containing delimiters)
*/ */
std::vector<std::string> split(const std::string& str, const std::string& delims, bool trimEmpty=true, bool keepDelim = false); std::vector<std::string> split(const std::string& str, const std::string& delims, bool dropEmpty=true, bool keepDelim = false);
/** Convert language code from iso2 code to iso3 /** Convert language code from iso2 code to iso3
* *

6
src/tools/stringTools.cpp
View File

@ -270,7 +270,7 @@ std::string kiwix::urlDecode(const std::string& value, bool component)
/* Split string in a token array */ /* Split string in a token array */
std::vector<std::string> kiwix::split(const std::string& str, std::vector<std::string> kiwix::split(const std::string& str,
const std::string& delims, const std::string& delims,
bool trimEmpty, bool dropEmpty,
bool keepDelim) bool keepDelim)
{ {
std::string::size_type lastPos = 0; std::string::size_type lastPos = 0;
@ -279,7 +279,7 @@ std::vector<std::string> kiwix::split(const std::string& str,
while( (pos = str.find_first_of(delims, lastPos)) < str.length() ) while( (pos = str.find_first_of(delims, lastPos)) < str.length() )
{ {
auto token = str.substr(lastPos, pos - lastPos); auto token = str.substr(lastPos, pos - lastPos);
if (!trimEmpty || !token.empty()) { if (!dropEmpty || !token.empty()) {
tokens.push_back(token); tokens.push_back(token);
} }
if (keepDelim) { if (keepDelim) {
@ -289,7 +289,7 @@ std::vector<std::string> kiwix::split(const std::string& str,
} }
auto token = str.substr(lastPos); auto token = str.substr(lastPos);
if (!trimEmpty || !token.empty()) { if (!dropEmpty || !token.empty()) {
tokens.push_back(token); tokens.push_back(token);
} }
return tokens; return tokens;