Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

CLI: Cosmetic issue - core show uptime

Browse Source 
Show uptime information ends with an unnecessary space.

Now NEEDCOMMA is better defined.

Change-Id: I11b360504a0703309ff51772ff8f672287f3c5a1
changes/94/594/1
ibercom 10 years ago
parent 86c79314f1
commit d463bac574
1 changed files with 10 additions and 8 deletions

18
main/cli.c
Unescape View File

@ -802,7 +802,7 @@ static void print_uptimestr(int fd, struct timeval timeval, const char *prefix,
#define DAY (HOUR*24) #define DAY (HOUR*24)
#define WEEK (DAY*7) #define WEEK (DAY*7)
#define YEAR (DAY*365) #define YEAR (DAY*365)
#define NEEDCOMMA(x) ((x)? ",": "") /* define if we need a comma */ #define NEEDCOMMA(x) ((x) ? ", " : "") /* define if we need a comma */
if (timeval.tv_sec < 0) /* invalid, nothing to show */ if (timeval.tv_sec < 0) /* invalid, nothing to show */
return; return;
@ -814,31 +814,33 @@ static void print_uptimestr(int fd, struct timeval timeval, const char *prefix,
if (timeval.tv_sec > YEAR) { if (timeval.tv_sec > YEAR) {
x = (timeval.tv_sec / YEAR); x = (timeval.tv_sec / YEAR);
timeval.tv_sec -= (x * YEAR); timeval.tv_sec -= (x * YEAR);
ast_str_append(&out, 0, "%d year%s%s ", x, ESS(x),NEEDCOMMA(timeval.tv_sec)); ast_str_append(&out, 0, "%d year%s%s", x, ESS(x), NEEDCOMMA(timeval.tv_sec));
} }
if (timeval.tv_sec > WEEK) { if (timeval.tv_sec > WEEK) {
x = (timeval.tv_sec / WEEK); x = (timeval.tv_sec / WEEK);
timeval.tv_sec -= (x * WEEK); timeval.tv_sec -= (x * WEEK);
ast_str_append(&out, 0, "%d week%s%s ", x, ESS(x),NEEDCOMMA(timeval.tv_sec)); ast_str_append(&out, 0, "%d week%s%s", x, ESS(x), NEEDCOMMA(timeval.tv_sec));
} }
if (timeval.tv_sec > DAY) { if (timeval.tv_sec > DAY) {
x = (timeval.tv_sec / DAY); x = (timeval.tv_sec / DAY);
timeval.tv_sec -= (x * DAY); timeval.tv_sec -= (x * DAY);
ast_str_append(&out, 0, "%d day%s%s ", x, ESS(x),NEEDCOMMA(timeval.tv_sec)); ast_str_append(&out, 0, "%d day%s%s", x, ESS(x), NEEDCOMMA(timeval.tv_sec));
} }
if (timeval.tv_sec > HOUR) { if (timeval.tv_sec > HOUR) {
x = (timeval.tv_sec / HOUR); x = (timeval.tv_sec / HOUR);
timeval.tv_sec -= (x * HOUR); timeval.tv_sec -= (x * HOUR);
ast_str_append(&out, 0, "%d hour%s%s ", x, ESS(x),NEEDCOMMA(timeval.tv_sec)); ast_str_append(&out, 0, "%d hour%s%s", x, ESS(x), NEEDCOMMA(timeval.tv_sec));
} }
if (timeval.tv_sec > MINUTE) { if (timeval.tv_sec > MINUTE) {
x = (timeval.tv_sec / MINUTE); x = (timeval.tv_sec / MINUTE);
timeval.tv_sec -= (x * MINUTE); timeval.tv_sec -= (x * MINUTE);
ast_str_append(&out, 0, "%d minute%s%s ", x, ESS(x),NEEDCOMMA(timeval.tv_sec)); ast_str_append(&out, 0, "%d minute%s%s", x, ESS(x), NEEDCOMMA(timeval.tv_sec));
} }
x = timeval.tv_sec; x = timeval.tv_sec;
if (x > 0 || ast_str_strlen(out) == 0) /* if there is nothing, print 0 seconds */ if (x > 0 || ast_str_strlen(out) == 0) {
ast_str_append(&out, 0, "%d second%s ", x, ESS(x)); /* if there is nothing, print 0 seconds */
ast_str_append(&out, 0, "%d second%s", x, ESS(x));
}
ast_cli(fd, "%s: %s\n", prefix, ast_str_buffer(out)); ast_cli(fd, "%s: %s\n", prefix, ast_str_buffer(out));
} }

Write Preview
Loading…
Cancel
Save