Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-06 05:17:57 +00:00
Code Issues Releases Activity

Refactored format_seconds and format_seconds_short

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1165 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Kevin Lyles 2008-06-19 07:04:11 +00:00
parent 40f2fcfd7b
commit bb80900ca6
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/common.c
View File

@ -213,26 +213,43 @@ void update_dns_data(void)
fclose(fp); fclose(fp);
} }
void format_seconds(char *buf, unsigned int n, long t) void format_seconds(char *buf, unsigned int n, long seconds)
{ {
if (t >= 24 * 60 * 60) { /* hours necessary when there are days? */ long days;
snprintf(buf, n, "%ldd %ldh %ldm", t / 60 / 60 / 24, (t / 60 / 60) % 24, int hours, minutes;
(t / 60) % 60);
} else if (t >= 60 * 60) { days = seconds / 86400;
snprintf(buf, n, "%ldh %ldm", (t / 60 / 60) % 24, (t / 60) % 60); seconds %= 86400;
hours = seconds / 3600;
seconds %= 3600;
minutes = seconds / 60;
seconds %= 60;
if (days > 0) {
snprintf(buf, n, "%ldd %dh %dm", days, hours, minutes);
} else { } else {
snprintf(buf, n, "%ldm %lds", t / 60, t % 60); snprintf(buf, n, "%dh %dm %lds", hours, minutes, seconds);
} }
} }
void format_seconds_short(char *buf, unsigned int n, long t) void format_seconds_short(char *buf, unsigned int n, long seconds)
{ {
if (t >= 24 * 60 * 60) { long days;
snprintf(buf, n, "%ldd %ldh", t / 60 / 60 / 24, (t / 60 / 60) % 24); int hours, minutes;
} else if (t >= 60 * 60) {
snprintf(buf, n, "%ldh %ldm", (t / 60 / 60) % 24, (t / 60) % 60); days = seconds / 86400;
seconds %= 86400;
hours = seconds / 3600;
seconds %= 3600;
minutes = seconds / 60;
seconds %= 60;
if (days > 0) {
snprintf(buf, n, "%ldd %dh", days, hours);
} else if (hours > 0) {
snprintf(buf, n, "%dh %dm", hours, minutes);
} else { } else {
snprintf(buf, n, "%ldm", t / 60); snprintf(buf, n, "%dm %lds", minutes, seconds);
} }
} }