From 34f862cfb9e23cd2d2e538682d93ced11441f774 Mon Sep 17 00:00:00 2001 From: rizzo Date: Sat, 18 Nov 2006 20:08:17 +0000 Subject: Move this macro from cli.c to cli.h so apps can use it without duplicating the macro or the code: /*! * In many cases we need to print singular or plural * words depending on a count. This macro helps us e.g. * printf("we have %d object%s", n, ESS(n)); */ #define ESS(x) ((x) == 1 ? "" : "s") git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47827 f38db490-d61c-443f-a65b-d21fe96a405b --- main/cli.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'main/cli.c') diff --git a/main/cli.c b/main/cli.c index fdde50fff..09f848cdb 100644 --- a/main/cli.c +++ b/main/cli.c @@ -341,7 +341,6 @@ static void print_uptimestr(int fd, time_t timeval, const char *prefix, int prin #define DAY (HOUR*24) #define WEEK (DAY*7) #define YEAR (DAY*365) -#define ESS(x) ((x == 1) ? "" : "s") /* plural suffix */ #define NEEDCOMMA(x) ((x)? ",": "") /* define if we need a comma */ if (timeval < 0) /* invalid, nothing to show */ return; @@ -938,7 +937,7 @@ static int group_show_channels(int fd, int argc, char *argv[]) if (havepattern) regfree(®exbuf); - ast_cli(fd, "%d active channel%s\n", numchans, (numchans != 1) ? "s" : ""); + ast_cli(fd, "%d active channel%s\n", numchans, ESS(numchans)); return RESULT_SUCCESS; #undef FORMAT_STRING } -- cgit v1.2.3