mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(utils): add stoi function

Browse source
This commit is contained in:
Ronan Abhamon 2017-08-04 09:35:05 +02:00
parent dc9e64a234
commit e61c25be5e
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/cpim/parser/cpim-parser.cpp
View file

@ -355,22 +355,22 @@ bool Cpim::Parser::coreHeaderIsValid<Cpim::DateTimeHeader>(const string &headerV
return false;
// Check date.
const int year = stoi(headerValue.substr(0, 4));
const int year = Utils::stoi(headerValue.substr(0, 4));
const bool isLeapYear = (year % 4 == 0 && year % 100 != 0) || year % 400 == 0;
const int month = stoi(headerValue.substr(5, 2));
const int month = Utils::stoi(headerValue.substr(5, 2));
if (month < 1 || month > 12)
return false;
const int day = stoi(headerValue.substr(8, 2));
const int day = Utils::stoi(headerValue.substr(8, 2));
if (day < 1 || (month == 2 && isLeapYear ? day > 29 : day > daysInMonth[month - 1]))
return false;
// Check time.
if (
stoi(headerValue.substr(11, 2)) > 24 ||
stoi(headerValue.substr(14, 2)) > 59 ||
stoi(headerValue.substr(17, 2)) > 60
Utils::stoi(headerValue.substr(11, 2)) > 24 ||
Utils::stoi(headerValue.substr(14, 2)) > 59 ||
Utils::stoi(headerValue.substr(17, 2)) > 60
)
return false;
@ -378,8 +378,8 @@ bool Cpim::Parser::coreHeaderIsValid<Cpim::DateTimeHeader>(const string &headerV
if (headerValue.back() != 'Z') {
size_t length = headerValue.length();
if (
stoi(headerValue.substr(length - 5, 2)) > 24 ||
stoi(headerValue.substr(length - 2, 2)) > 59
Utils::stoi(headerValue.substr(length - 5, 2)) > 24 ||
Utils::stoi(headerValue.substr(length - 2, 2)) > 59
)
return false;
}

10
src/utils/utils.cpp
View file

@ -47,3 +47,13 @@ vector<string> Utils::split (const string &str, const string &delimiter) {
return out;
}
int Utils::stoi (const string &str, size_t *idx, int base) {
char *p;
int v = strtol(str.c_str(), &p, base);
if (idx)
*idx = p - str.c_str();
return v;
}

2
src/utils/utils.h
View file

@ -33,6 +33,8 @@ namespace LinphonePrivate {
inline std::vector<std::string> split (const std::string &str, char delimiter) {
return split(str, std::string(1, delimiter));
}
int stoi (const std::string &str, size_t *idx = 0, int base = 10);
}
}