0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made use of config_attribute_value::to_time_t

Browse source
This commit is contained in:
Charles Dang 2018-04-27 13:15:07 +11:00
parent c1f3cffa1c
commit 6dfb87103c
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/campaign_server/campaign_server.cpp
View file

@ -587,14 +587,14 @@ void server::handle_request_campaign_list(const server::request& req)
bool before_flag = false;
time_t before = epoch;
try {
before = before + lexical_cast<time_t>(req.cfg["before"]);
before += req.cfg["before"].to_time_t();
before_flag = true;
} catch(bad_lexical_cast) {}
bool after_flag = false;
time_t after = epoch;
try {
after = after + lexical_cast<time_t>(req.cfg["after"]);
after += req.cfg["after"].to_time_t();
after_flag = true;
} catch(bad_lexical_cast) {}
@ -611,12 +611,12 @@ void server::handle_request_campaign_list(const server::request& req)
continue;
}
const std::string& tm = i["timestamp"];
const auto& tm = i["timestamp"];
if(before_flag && (tm.empty() || lexical_cast_default<time_t>(tm, 0) >= before)) {
if(before_flag && (tm.empty() || tm.to_time_t(0) >= before)) {
continue;
}
if(after_flag && (tm.empty() || lexical_cast_default<time_t>(tm, 0) <= after)) {
if(after_flag && (tm.empty() || tm.to_time_t(0) <= after)) {
continue;
}

2
src/save_index.cpp
View file

@ -85,7 +85,7 @@ config& save_index_class::get(const std::string& name)
time_t m = modified_[name];
config::attribute_value& mod_time = result["mod_time"];
if(mod_time.empty() || static_cast<time_t>(mod_time.to_int()) != m) {
if(mod_time.empty() || mod_time.to_time_t() != m) {
rebuild(name, m);
}

4
src/server/ban.cpp
View file

@ -174,9 +174,9 @@ static lg::log_domain log_server("server");
}
nick_ = cfg["nick"].str();
if (cfg.has_attribute("end_time"))
end_time_ = lexical_cast_default<time_t>(cfg["end_time"], 0);
end_time_ = cfg["end_time"].to_time_t(0);
if (cfg.has_attribute("start_time"))
start_time_ = lexical_cast_default<time_t>(cfg["start_time"], 0);
start_time_ = cfg["start_time"].to_time_t(0);
reason_ = cfg["reason"].str();
// only overwrite defaults if exists

2
src/server/server.cpp
View file

@ -405,7 +405,7 @@ void server::load_config() {
admin_passwd_ = cfg_["passwd"].str();
motd_ = cfg_["motd"].str();
lan_server_ = lexical_cast_default<time_t>(cfg_["lan_server"], 0);
lan_server_ = cfg_["lan_server"].to_time_t(0);
uh_name_ = cfg_["user_handler"].str();
deny_unregistered_login_ = cfg_["deny_unregistered_login"].to_bool();