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

Nuke another use of snprintf

Browse source
This commit is contained in:
Celtic Minstrel 2017-03-17 10:53:18 -04:00
parent 1de48a6cb6
commit 96c79ba6b3
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/log.cpp
View file

@ -179,20 +179,20 @@ std::string get_timestamp(const time_t& t, const std::string& format) {
return ss.str();
}
std::string get_timespan(const time_t& t) {
char buf[100];
std::ostringstream sout;
// There doesn't seem to be any library function for this
const time_t minutes = t / 60;
const time_t days = minutes / 60 / 24;
if(t <= 0) {
strncpy(buf, "expired", 100);
sout << "expired";
} else if(minutes == 0) {
snprintf(buf, 100, "%ld seconds", t);
sout << t << " seconds";
} else if(days == 0) {
snprintf(buf, 100, "%ld hours, %ld minutes", minutes / 60, minutes % 60);
sout << minutes / 60 << " hours, " << minutes % 60 << " minutes";
} else {
snprintf(buf, 100, "%ld days, %ld hours, %ld minutes", days, (minutes / 60) % 24, minutes % 60);
sout << days << " days, " << (minutes / 60) % 24 << " hours, " << minutes % 60 << " minutes";
}
return buf;
return sout.str();
}
static void print_precise_timestamp(std::ostream & out)