diff options
| author | ibercom <ibercom123@gmail.com> | 2015-06-04 14:14:13 +0200 |
|---|---|---|
| committer | ibercom <ibercom123@gmail.com> | 2015-06-05 02:16:24 -0500 |
| commit | e0090216db3e6d4b7796bbb0b230225bfdbe068e (patch) | |
| tree | 918edb9fa91fc2605af9fc01874da8332662b8e8 /main | |
| parent | 88212ccb7f24b100f9348511cd940c7d2c199966 (diff) | |
CLI: Cosmetic issue - core show uptime
Show uptime information ends with an unnecessary space.
Now NEEDCOMMA is better defined.
Change-Id: I11b360504a0703309ff51772ff8f672287f3c5a1
Diffstat (limited to 'main')
| -rw-r--r-- | main/cli.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/main/cli.c b/main/cli.c index 08856b67f..47c48d6b1 100644 --- a/main/cli.c +++ b/main/cli.c @@ -802,7 +802,7 @@ static void print_uptimestr(int fd, struct timeval timeval, const char *prefix, #define DAY (HOUR*24) #define WEEK (DAY*7) #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 */ return; @@ -814,31 +814,33 @@ static void print_uptimestr(int fd, struct timeval timeval, const char *prefix, if (timeval.tv_sec > YEAR) { x = (timeval.tv_sec / 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) { x = (timeval.tv_sec / 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) { x = (timeval.tv_sec / 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) { x = (timeval.tv_sec / 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) { x = (timeval.tv_sec / 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; - if (x > 0 || ast_str_strlen(out) == 0) /* if there is nothing, print 0 seconds */ - ast_str_append(&out, 0, "%d second%s ", x, ESS(x)); + if (x > 0 || ast_str_strlen(out) == 0) { + /* 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)); } |