tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shared

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-11-09 12:13:30 +01:00
parent dd58fd6dc3
commit 8b6082a89f
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/filters/cmdtalk.py
View File

@ -33,12 +33,16 @@ PY3 = sys.version > '3'
if PY3: if PY3:
def makebytes(data): def makebytes(data):
if data is None:
return b""
if isinstance(data, bytes): if isinstance(data, bytes):
return data return data
else: else:
return data.encode("UTF-8") return data.encode("UTF-8")
else: else:
def makebytes(data): def makebytes(data):
if data is None:
return ""
if isinstance(data, unicode): if isinstance(data, unicode):
return data.encode("UTF-8") return data.encode("UTF-8")
else: else:

23
src/utils/smallut.cpp
View File

@ -88,13 +88,9 @@ int stringicmp(const string& s1, const string& s2)
} }
void stringtolower(string& io) void stringtolower(string& io)
{ {
string::iterator it = io.begin(); std::transform(io.begin(), io.end(), io.begin(), [](unsigned char c) { return std::tolower(c); });
string::iterator ite = io.end();
while (it != ite) {
*it = ::tolower(*it);
it++;
}
} }
string stringtolower(const string& i) string stringtolower(const string& i)
{ {
string o = i; string o = i;
@ -104,13 +100,9 @@ string stringtolower(const string& i)
void stringtoupper(string& io) void stringtoupper(string& io)
{ {
string::iterator it = io.begin(); std::transform(io.begin(), io.end(), io.begin(), [](unsigned char c) { return std::toupper(c); });
string::iterator ite = io.end();
while (it != ite) {
*it = ::toupper(*it);
it++;
}
} }
string stringtoupper(const string& i) string stringtoupper(const string& i)
{ {
string o = i; string o = i;
@ -961,10 +953,9 @@ static void cerrdip(const string& s, DateInterval *dip)
// back // back
static bool addperiod(DateInterval *dp, DateInterval *pp) static bool addperiod(DateInterval *dp, DateInterval *pp)
{ {
struct tm tm;
// Create a struct tm with possibly non normalized fields and let // Create a struct tm with possibly non normalized fields and let
// timegm sort it out // timegm sort it out
memset(&tm, 0, sizeof(tm)); struct tm tm = {};
tm.tm_year = dp->y1 - 1900 + pp->y1; tm.tm_year = dp->y1 - 1900 + pp->y1;
tm.tm_mon = dp->m1 + pp->m1 - 1; tm.tm_mon = dp->m1 + pp->m1 - 1;
tm.tm_mday = dp->d1 + pp->d1; tm.tm_mday = dp->d1 + pp->d1;
@ -1360,7 +1351,7 @@ string flagsToString(const vector<CharFlags>& flags, unsigned int val)
{ {
const char *s; const char *s;
string out; string out;
for (auto& flag : flags) { for (const auto& flag : flags) {
if ((val & flag.value) == flag.value) { if ((val & flag.value) == flag.value) {
s = flag.yesname; s = flag.yesname;
} else { } else {
@ -1381,7 +1372,7 @@ string flagsToString(const vector<CharFlags>& flags, unsigned int val)
string valToString(const vector<CharFlags>& flags, unsigned int val) string valToString(const vector<CharFlags>& flags, unsigned int val)
{ {
string out; string out;
for (auto& flag : flags) { for (const auto& flag : flags) {
if (flag.value == val) { if (flag.value == val) {
out = flag.yesname; out = flag.yesname;
return out; return out;