From 5f8f3ef148e0f8999d88caf561237b903cc70c38 Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 12 Jan 2015 20:34:26 +0000 Subject: [PATCH] - misc.c: style corrections git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5368 82007160-df01-0410-b94d-b575c5fd34c7 --- src/misc.c | 153 +++++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 76 deletions(-) diff --git a/src/misc.c b/src/misc.c index 3c0e2f6..a07c436 100644 --- a/src/misc.c +++ b/src/misc.c @@ -33,92 +33,93 @@ * Split a time_t into an English-language explanation of how * much time it represents, e.g. "2 hours 45 minutes 8 seconds" */ -char *dissect_time(time_t time) +char * +dissect_time(time_t time) { - static char buf[64]; - unsigned int years, weeks, days, hours, minutes, seconds; + static char buf[64]; + unsigned int years, weeks, days, hours, minutes, seconds; - years = weeks = days = hours = minutes = seconds = 0; + years = weeks = days = hours = minutes = seconds = 0; - while (time >= 60 * 60 * 24 * 365) - { - time -= 60 * 60 * 24 * 365; - years++; - } + while (time >= 60 * 60 * 24 * 365) + { + time -= 60 * 60 * 24 * 365; + years++; + } - while (time >= 60 * 60 * 24 * 7) - { - time -= 60 * 60 * 24 * 7; - weeks++; - } + while (time >= 60 * 60 * 24 * 7) + { + time -= 60 * 60 * 24 * 7; + weeks++; + } - while (time >= 60 * 60 * 24) - { - time -= 60 * 60 * 24; - days++; - } + while (time >= 60 * 60 * 24) + { + time -= 60 * 60 * 24; + days++; + } - while (time >= 60 * 60) - { - time -= 60 * 60; - hours++; - } + while (time >= 60 * 60) + { + time -= 60 * 60; + hours++; + } - while (time >= 60) - { - time -= 60; - minutes++; - } + while (time >= 60) + { + time -= 60; + minutes++; + } - seconds = time; + seconds = time; - if (years) - { + if (years) + { + snprintf(buf, sizeof(buf), + "%d year%s, %d week%s, %d day%s, %02d:%02d:%02d", + years, years == 1 ? "" : "s", weeks, + weeks == 1 ? "" : "s", days, days == 1 ? "" : "s", + hours, minutes, seconds); + } + else if (weeks) + { + snprintf(buf, sizeof(buf), + "%d week%s, %d day%s, %02d:%02d:%02d", weeks, + weeks == 1 ? "" : "s", days, days == 1 ? "" : "s", + hours, minutes, seconds); + } + else if (days) + { + snprintf(buf, sizeof(buf), "%d day%s, %02d:%02d:%02d", + days, days == 1 ? "" : "s", hours, minutes, seconds); + } + else if (hours) + { + if (minutes || seconds) + { snprintf(buf, sizeof(buf), - "%d year%s, %d week%s, %d day%s, %02d:%02d:%02d", - years, years == 1 ? "" : "s", weeks, - weeks == 1 ? "" : "s", days, days == 1 ? "" : "s", - hours, minutes, seconds); - } - else if (weeks) - { - snprintf(buf, sizeof(buf), - "%d week%s, %d day%s, %02d:%02d:%02d", weeks, - weeks == 1 ? "" : "s", days, days == 1 ? "" : "s", - hours, minutes, seconds); - } - else if (days) - { - snprintf(buf, sizeof(buf), "%d day%s, %02d:%02d:%02d", - days, days == 1 ? "" : "s", hours, minutes, seconds); - } - else if (hours) - { - if (minutes || seconds) - { - snprintf(buf, sizeof(buf), - "%d hour%s, %d minute%s, %d second%s", hours, - hours == 1 ? "" : "s", minutes, - minutes == 1 ? "" : "s", seconds, - seconds == 1 ? "" : "s"); - } - else - { - snprintf(buf, sizeof(buf), "%d hour%s", hours, - hours == 1 ? "" : "s"); - } - } - else if (minutes) - { - snprintf(buf, sizeof(buf), "%d minute%s, %d second%s", - minutes, minutes == 1 ? "" : "s", seconds, - seconds == 1 ? "" : "s"); - } - else - { - snprintf(buf, sizeof(buf), "%d second%s", seconds, + "%d hour%s, %d minute%s, %d second%s", hours, + hours == 1 ? "" : "s", minutes, + minutes == 1 ? "" : "s", seconds, seconds == 1 ? "" : "s"); - } + } + else + { + snprintf(buf, sizeof(buf), "%d hour%s", hours, + hours == 1 ? "" : "s"); + } + } + else if (minutes) + { + snprintf(buf, sizeof(buf), "%d minute%s, %d second%s", + minutes, minutes == 1 ? "" : "s", seconds, + seconds == 1 ? "" : "s"); + } + else + { + snprintf(buf, sizeof(buf), "%d second%s", seconds, + seconds == 1 ? "" : "s"); + } - return(buf); + return buf; } -- 2.30.2