[Asterisk-cvs] asterisk/pbx pbx_spool.c,1.24,1.25

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk/pbx
In directory localhost.localdomain:/tmp/cvs-serv16526/pbx

Modified Files:
	pbx_spool.c 
Log Message:
make CLI output use singular/plural when appropriate (bug #4654)


Index: pbx_spool.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_spool.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- pbx_spool.c	6 Jun 2005 22:12:19 -0000	1.24
+++ pbx_spool.c	7 Jul 2005 22:32:20 -0000	1.25
@@ -235,7 +235,7 @@
 		ast_log(LOG_NOTICE, "Call failed to go through, reason %d\n", reason);
 		if (o->retries >= o->maxretries + 1) {
 			/* Max retries exceeded */
-			ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt(s)\n", o->tech, o->dest, o->retries - 1);
+			ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt%s\n", o->tech, o->dest, o->retries - 1, ((o->retries - 1) != 1) ? "s" : "");
 			unlink(o->fn);
 		} else {
 			/* Notate that the call is still active */
@@ -294,7 +294,7 @@
 					now += o->retrytime;
 					return now;
 				} else {
-					ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt(s)\n", o->tech, o->dest, o->retries - 1);
+					ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt%s\n", o->tech, o->dest, o->retries - 1, ((o->retries - 1) != 1) ? "s" : "");
 					free(o);
 					unlink(fn);
 					return 0;