ESS-ification.

no need to bring this in 1.4, it is just code cleanup

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47829 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/cdr.c b/main/cdr.c
index ce525e20b835c873f1dc52c5062b9c9c49f3957b..3e85b05fa6b3e39e37b877fb45f62f993f797c28 100644 (file)
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -984,10 +984,10 @@ static int handle_cli_status(int fd, int argc, char *argv[])
                                nextbatchtime = ast_sched_when(sched, cdr_sched);
                        ast_cli(fd, "CDR safe shut down: %s\n", batchsafeshutdown ? "enabled" : "disabled");
                        ast_cli(fd, "CDR batch threading model: %s\n", batchscheduleronly ? "scheduler only" : "scheduler plus separate threads");
-                       ast_cli(fd, "CDR current batch size: %d record%s\n", cnt, (cnt != 1) ? "s" : "");
-                       ast_cli(fd, "CDR maximum batch size: %d record%s\n", batchsize, (batchsize != 1) ? "s" : "");
-                       ast_cli(fd, "CDR maximum batch time: %d second%s\n", batchtime, (batchtime != 1) ? "s" : "");
-                       ast_cli(fd, "CDR next scheduled batch processing time: %ld second%s\n", nextbatchtime, (nextbatchtime != 1) ? "s" : "");
+                       ast_cli(fd, "CDR current batch size: %d record%s\n", cnt, ESS(cnt));
+                       ast_cli(fd, "CDR maximum batch size: %d record%s\n", batchsize, ESS(batchsize));
+                       ast_cli(fd, "CDR maximum batch time: %d second%s\n", batchtime, ESS(batchtime));
+                       ast_cli(fd, "CDR next scheduled batch processing time: %ld second%s\n", nextbatchtime, ESS(nextbatchtime));
                }
                AST_LIST_LOCK(&be_list);
                AST_LIST_TRAVERSE(&be_list, beitem, list) {

diff --git a/res/res_features.c b/res/res_features.c
index b1d50e59b536e5fd9e24df89a68e0639e6dba0fd..485dcbc19f79940575dde7f2e1367fe1a3dbfd98 100644 (file)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1917,7 +1917,7 @@ static int handle_parkedcalls(int fd, int argc, char *argv[])
                numparked++;
        }
        ast_mutex_unlock(&parking_lock);
-       ast_cli(fd, "%d parked call%s.\n", numparked, (numparked != 1) ? "s" : "");
+       ast_cli(fd, "%d parked call%s.\n", numparked, ESS(numparked));
 
 
        return RESULT_SUCCESS;

diff --git a/res/res_realtime.c b/res/res_realtime.c
index 8f382fefde55e638e3185d1e8d369d763f357823..ee107357632909f2891b2122ad649470bdf7fd69 100644 (file)
--- a/res/res_realtime.c
+++ b/res/res_realtime.c
@@ -88,7 +88,7 @@ static int cli_realtime_update(int fd, int argc, char **argv) {
                return RESULT_SUCCESS;
        }
 
-       ast_cli(fd, "Updated %d RealTime record%s.\n", res, (res != 1) ? "s" : "");
+       ast_cli(fd, "Updated %d RealTime record%s.\n", res, ESS(res));
 
        return RESULT_SUCCESS;
 }