[asterisk-commits] tilghman: trunk r103805 - /trunk/main/say.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Feb 18 18:59:41 CST 2008


Author: tilghman
Date: Mon Feb 18 18:59:40 2008
New Revision: 103805

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103805
Log:
Change verbosity into debug for Hebrew (and various whitespace fixes)
(Closes issue #12011)

Modified:
    trunk/main/say.c

Modified: trunk/main/say.c
URL: http://svn.digium.com/view/asterisk/trunk/main/say.c?view=diff&rev=103805&r1=103804&r2=103805
==============================================================================
--- trunk/main/say.c (original)
+++ trunk/main/say.c Mon Feb 18 18:59:40 2008
@@ -28,7 +28,7 @@
  * \note 2007-02-08 : Support for Georgian added by Alexander Shaduri <ashaduri at gmail.com>,
  *  						Next Generation Networks (NGN).
  * \note 2007-03-20 : Support for Thai added by Dome C. <dome at tel.co.th>,
- *  						IP Crossing Co.,Ltd.
+ *  						IP Crossing Co., Ltd.
  */
 
 #include "asterisk.h"
@@ -423,7 +423,7 @@
 /* Called from AGI */
 static int say_number_full(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
-	if (!strcasecmp(language,"en") ) {	/* English syntax */
+	if (!strcasecmp(language, "en") ) {	/* English syntax */
 	   return(ast_say_number_full_en(chan, num, ints, language, audiofd, ctrlfd));
 	} else if (!strcasecmp(language, "cz") ) {	/* Czech syntax */
 	   return(ast_say_number_full_cz(chan, num, ints, language, options, audiofd, ctrlfd));
@@ -477,7 +477,7 @@
 	int playh = 0;
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 	while (!res && (num || playh)) {
 		if (num < 0) {
@@ -579,7 +579,7 @@
 		options = "w";
 	
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 	
 	while (!res && (num || playh)) {
 		if (num < 0) {
@@ -590,11 +590,11 @@
 				num = 0;
 			}	
 		} else if (num < 3 ) {
-			snprintf(fn, sizeof(fn), "digits/%d%c",num,options[0]);
+			snprintf(fn, sizeof(fn), "digits/%d%c", num, options[0]);
 			playh = 0;
 			num = 0;
 		} else if (num < 20) {
-			snprintf(fn, sizeof(fn), "digits/%d",num);
+			snprintf(fn, sizeof(fn), "digits/%d", num);
 			playh = 0;
 			num = 0;
 		} else if (num < 100) {
@@ -607,7 +607,7 @@
 			} else if ( hundered == 2 ) {
 				ast_copy_string(fn, "digits/2ste", sizeof(fn));
 			} else {
-					res = ast_say_number_full_cz(chan,hundered,ints,language,options,audiofd,ctrlfd);
+					res = ast_say_number_full_cz(chan, hundered, ints, language, options, audiofd, ctrlfd);
 				if (res)
 					return res;
 				if (hundered == 3 || hundered == 4) {	
@@ -631,16 +631,16 @@
 				}
 			}
 			if ( left > 1 )	{ /* we dont say "one thousand" but only thousand */
-				res = ast_say_number_full_cz(chan,left,ints,language,options,audiofd,ctrlfd);
+				res = ast_say_number_full_cz(chan, left, ints, language, options, audiofd, ctrlfd);
 				if (res) 
 					return res;
 			}
 			if ( left >= 5 ) { /* >= 5 have the same declesion */
-				snprintf(fn, sizeof(fn), "digits/5_E%d",length-1);	
+				snprintf(fn, sizeof(fn), "digits/5_E%d", length - 1);	
 			} else if ( left >= 2 && left <= 4 ) {
-				snprintf(fn, sizeof(fn), "digits/2-4_E%d",length-1);
+				snprintf(fn, sizeof(fn), "digits/2-4_E%d", length - 1);
 			} else { /* left == 1 */
-				snprintf(fn, sizeof(fn), "digits/1_E%d",length-1);
+				snprintf(fn, sizeof(fn), "digits/1_E%d", length - 1);
 			}
 			num -= left * (exp10_int(length-1));
 		}
@@ -670,9 +670,9 @@
 	int cn = 1;		/* +1 = commune; -1 = neuter */
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-
-	if (options && !strncasecmp(options, "n",1)) cn = -1;
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+	if (options && !strncasecmp(options, "n", 1)) cn = -1;
 
 	while (!res && (num || playh || playa )) {
 		/* The grammar for Danish numbers is the same as for English except
@@ -782,9 +782,9 @@
 	char fn[256] = "";
 	char fna[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-
-	if (options && (!strncasecmp(options, "f",1)))
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+	if (options && (!strncasecmp(options, "f", 1)))
 		mf = -1;
 
 	while (!res && num) {
@@ -917,7 +917,7 @@
 	int playa = 0;
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 	while (!res && (num || playh || playa )) {
 		if (num < 0) {
@@ -995,10 +995,10 @@
 	int mf = 0;                            /* +1 = male; -1 = female */
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 	if (options) {
-		if (!strncasecmp(options, "f",1))
+		if (!strncasecmp(options, "f", 1))
 			mf = -1;
 		else if (!strncasecmp(options, "m", 1))
 			mf = 1;
@@ -1100,9 +1100,9 @@
 	int mf = 1;                            /* +1 = male; -1 = female */
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 	
-	if (options && !strncasecmp(options, "f",1))
+	if (options && !strncasecmp(options, "f", 1))
 		mf = -1;
 
 	while (!res && (num || playh || playa)) {
@@ -1233,14 +1233,14 @@
 	int state = 0; /* no need to save anything */
 	int mf = 1;    /* +1 = Masculin; -1 = Feminin */
 	char fn[SAY_NUM_BUF_SIZE] = "";
-	ast_verb(3, "ast_say_digits_full: started. "
+	ast_debug(3, "ast_say_digits_full: started. "
 		"num: %d, options=\"%s\"\n",
 		num, options
 	);
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 	
-	if (options && !strncasecmp(options, "f",1))
+	if (options && !strncasecmp(options, "f", 1))
 		mf = -1;
 
 	/* Do we have work to do? */
@@ -1252,40 +1252,40 @@
 		 * state==0 is the normal mode and it means that we continue
 		 * to check if the number num has yet anything left.
 		 */
-		ast_verb(3, "ast_say_digits_full: num: %d, "
+		ast_debug(3, "ast_say_digits_full: num: %d, "
 			"state=%d, options=\"%s\", mf=%d\n",
 			num, state, options, mf
 		);
-		if (state==1) {
+		if (state == 1) {
 			ast_copy_string(fn, "digits/hundred", sizeof(fn));
 			state = 0;
-		} else if (state==2) {
+		} else if (state == 2) {
 			ast_copy_string(fn, "digits/ve", sizeof(fn));
 			state = 0;
-		} else if (state==3) {
+		} else if (state == 3) {
 			ast_copy_string(fn, "digits/thousands", sizeof(fn));
 			state=0;
-		} else if (num <21) {
+		} else if (num < 21) {
 			if (mf < 0)
 				snprintf(fn, sizeof(fn), "digits/%dF", num);
 			else
 				snprintf(fn, sizeof(fn), "digits/%d", num);
 			num = 0;
 		} else if (num < 100) {
-			snprintf(fn, sizeof(fn), "digits/%d", (num/10)*10);
+			snprintf(fn, sizeof(fn), "digits/%d", (num / 10) * 10);
 			num = num % 10;
-			if (num>0) state=2;
+			if (num > 0) state = 2;
 		} else if (num < 200) {
 			ast_copy_string(fn, "digits/1hundred", sizeof(fn));
 			num = num - 100;
-			state=2;
+			state = 2;
 		} else if (num < 300) {
 			ast_copy_string(fn, "digits/2hundred", sizeof(fn));
 			num = num - 200;
-			state=2;
+			state = 2;
 		} else if (num < 1000) {
-			snprintf(fn, sizeof(fn), "digits/%d", (num/100));
-			state=1;
+			snprintf(fn, sizeof(fn), "digits/%d", (num / 100));
+			state = 1;
 			num = num % 100;
 		} else if (num < 2000) {
 			ast_copy_string(fn, "digits/thousand", sizeof(fn));
@@ -1293,11 +1293,12 @@
 		} else if (num < 3000) {
 			ast_copy_string(fn, "digits/2thousand", sizeof(fn));
 			num = num - 2000;
-                        if (num>0) state=2;
+			if (num > 0)
+				state = 2;
 		} else if (num < 20000) {
-			snprintf(fn, sizeof(fn), "digits/%ds",(num/1000));
+			snprintf(fn, sizeof(fn), "digits/%ds", (num / 1000));
 			num = num % 1000;
-			state=3;
+			state = 3;
 		} else if (num < 1000000) {
 			res = ast_say_number_full_he(chan, num / 1000, ints, language, options, audiofd, ctrlfd);
 			if (res)
@@ -1338,7 +1339,7 @@
 	int playh = 0;
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 	/*
 	Hungarian support
@@ -1417,7 +1418,7 @@
 	char fn[256] = "";
 
 	if (!num)
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 		/*
 		Italian support
@@ -1571,7 +1572,7 @@
 	int units = 0;
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 	while (!res && (num || playh )) {
 		if (num < 0) {
 			ast_copy_string(fn, "digits/minus", sizeof(fn));
@@ -1665,9 +1666,9 @@
 	char fn[256] = "";
 	
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 	
-	if (options && !strncasecmp(options, "n",1)) cn = -1;
+	if (options && !strncasecmp(options, "n", 1)) cn = -1;
 
 	while (!res && (num || playh || playa )) {
 		/* The grammar for Norwegian numbers is the same as for English except
@@ -1951,13 +1952,13 @@
 
 */
 {
-	char *zenski_cyfry[] = {"0","1z", "2z", "3", "4", "5", "6", "7", "8", "9"};
-
-	char *zenski_cyfry2[] = {"0","1", "2z", "3", "4", "5", "6", "7", "8", "9"};
-
-	char *meski_cyfry[] = {"0","1", "2-1m", "3-1m", "4-1m", "5m",  /*"2-1mdwaj"*/ "6m", "7m", "8m", "9m"};
-
-	char *meski_cyfry2[] = {"0","1", "2-2m", "3-2m", "4-2m", "5m", "6m", "7m", "8m", "9m"};
+	char *zenski_cyfry[] = {"0", "1z", "2z", "3", "4", "5", "6", "7", "8", "9"};
+
+	char *zenski_cyfry2[] = {"0", "1", "2z", "3", "4", "5", "6", "7", "8", "9"};
+
+	char *meski_cyfry[] = {"0", "1", "2-1m", "3-1m", "4-1m", "5m",  /*"2-1mdwaj"*/ "6m", "7m", "8m", "9m"};
+
+	char *meski_cyfry2[] = {"0", "1", "2-2m", "3-2m", "4-2m", "5m", "6m", "7m", "8m", "9m"};
 
 	char *meski_setki[] = {"", "100m", "200m", "300m", "400m", "500m", "600m", "700m", "800m", "900m"};
 
@@ -1965,9 +1966,9 @@
 
 	char *meski_nastki[] = {"", "11m", "12m", "13m", "14m", "15m", "16m", "17m", "18m", "19m"};
 
-	char *nijaki_cyfry[] = {"0","1", "2", "3", "4", "5", "6", "7", "8", "9"};
-
-	char *nijaki_cyfry2[] = {"0","1", "2", "3", "4", "5", "6", "7", "8", "9"};
+	char *nijaki_cyfry[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
+
+	char *nijaki_cyfry2[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
 
 	char *nijaki_setki[] = {"", "100", "200", "300", "400", "500", "600", "700", "800", "900"};
 
@@ -2051,9 +2052,9 @@
 	char fn[256] = "";
 
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-
-	if (options && !strncasecmp(options, "f",1))
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+
+	if (options && !strncasecmp(options, "f", 1))
 		mf = -1;
 
 	while (!res && num ) {
@@ -2146,8 +2147,8 @@
 	char fn[256] = "";
 	int cn = 1;		/* +1 = commune; -1 = neuter */
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
-	if (options && !strncasecmp(options, "n",1)) cn = -1;
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
+	if (options && !strncasecmp(options, "n", 1)) cn = -1;
 
 	while (!res && (num || playh)) {
 		if (num < 0) {
@@ -2217,7 +2218,7 @@
 	int playh = 0;
 	char fn[256] = "";
 	if (!num)
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 	while (!res && (num || playh)) {
 			if (num < 0) {
@@ -2309,7 +2310,7 @@
 	int lastdigits = 0;
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 	while (!res && (num)) {
 		if (num < 0) {
@@ -2387,7 +2388,7 @@
 	int playh = 0;
 	char fn[256] = "";
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 	while(!res && (num || playh)) {
 		if (num < 0) {
@@ -2454,7 +2455,7 @@
 /* Called from AGI */
 static int say_enumeration_full(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)
 {
-	if (!strcasecmp(language,"en") ) {	/* English syntax */
+	if (!strcasecmp(language, "en") ) {	/* English syntax */
 	   return(ast_say_enumeration_full_en(chan, num, ints, language, audiofd, ctrlfd));
 	} else if (!strcasecmp(language, "da") ) {	/* Danish syntax */
 	   return(ast_say_enumeration_full_da(chan, num, ints, language, options, audiofd, ctrlfd));
@@ -2573,16 +2574,16 @@
 	char fn[256] = "", fna[256] = "";
 	char *gender;
 
-	if (options && !strncasecmp(options, "f",1)) {
+	if (options && !strncasecmp(options, "f", 1)) {
 		gender = "F";
-	} else if (options && !strncasecmp(options, "n",1)) {
+	} else if (options && !strncasecmp(options, "n", 1)) {
 		gender = "N";
 	} else {
 		gender = "";
 	}
 
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 	while (!res && num) {
 		if (num < 0) {
@@ -2736,16 +2737,16 @@
 	char fn[256] = "", fna[256] = "";
 	char *gender;
 
-	if (options && !strncasecmp(options, "f",1)) {
+	if (options && !strncasecmp(options, "f", 1)) {
 		gender = "F";
-	} else if (options && !strncasecmp(options, "n",1)) {
+	} else if (options && !strncasecmp(options, "n", 1)) {
 		gender = "N";
 	} else {
 		gender = "";
 	}
 
 	if (!num) 
-		return ast_say_digits_full(chan, 0,ints, language, audiofd, ctrlfd);
+		return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
 
 	while (!res && num) {
 		if (num < 0) {
@@ -2983,10 +2984,10 @@
 				/* We'll just be silent on the year, instead of bombing out. */
 			} else {
 			    /* year 1100 to 1999. will anybody need this?!? */
-				snprintf(fn,sizeof(fn), "digits/%d", (year / 100) );
+				snprintf(fn, sizeof(fn), "digits/%d", (year / 100));
 				res = wait_file(chan, ints, fn, lang);
 				if (!res) {
-					res = wait_file(chan,ints, "digits/hundred", lang);
+					res = wait_file(chan, ints, "digits/hundred", lang);
 					if (!res && year % 100 != 0) {
 						res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);	
 					}
@@ -3033,10 +3034,10 @@
 			} else {
 			    /* year 1100 to 1999. will anybody need this?!? */
 			    /* say 1967 as 'neunzehn hundert sieben und sechzig' */
-				snprintf(fn,sizeof(fn), "digits/%d", (year / 100) );
+				snprintf(fn, sizeof(fn), "digits/%d", (year / 100) );
 				res = wait_file(chan, ints, fn, lang);
 				if (!res) {
-					res = wait_file(chan,ints, "digits/hundred", lang);
+					res = wait_file(chan, ints, "digits/hundred", lang);
 					if (!res && year % 100 != 0) {
 						res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);	
 					}
@@ -3257,20 +3258,20 @@
 				for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++)
 					sndfile[sndoffset] = format[offset];
 				sndfile[sndoffset] = '\0';
-				res = wait_file(chan,ints,sndfile,lang);
+				res = wait_file(chan, ints, sndfile, lang);
 				break;
 			case 'A':
 			case 'a':
 				/* Sunday - Saturday */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'B':
 			case 'b':
 			case 'h':
 				/* January - December */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'm':
 				/* Month enumerated */
@@ -3293,7 +3294,7 @@
 					if (!res) {
 						if (tm.tm_year <= 9) {
 							/* 1901 - 1909 */
-							res = wait_file(chan,ints, "digits/oh", lang);
+							res = wait_file(chan, ints, "digits/oh", lang);
 						}
 
 						res |= ast_say_number(chan, tm.tm_year, ints, lang, (char *) NULL);
@@ -3306,10 +3307,10 @@
 				if (tm.tm_hour == 0)
 					ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
 				else if (tm.tm_hour > 12)
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
 				else
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour);
-				res = wait_file(chan,ints,nextmsg,lang);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'H':
 			case 'k':
@@ -3317,24 +3318,24 @@
 				if (format[offset] == 'H') {
 					/* e.g. oh-eight */
 					if (tm.tm_hour < 10) {
-						res = wait_file(chan,ints, "digits/oh",lang);
+						res = wait_file(chan, ints, "digits/oh", lang);
 					}
 				} else {
 					/* e.g. eight */
 					if (tm.tm_hour == 0) {
-						res = wait_file(chan,ints, "digits/oh",lang);
+						res = wait_file(chan, ints, "digits/oh", lang);
 					}
 				}
 				if (!res) {
 					if (tm.tm_hour != 0) {
 						int remainder = tm.tm_hour;
 						if (tm.tm_hour > 20) {
-							res = wait_file(chan,ints, "digits/20",lang);
+							res = wait_file(chan, ints, "digits/20", lang);
 							remainder -= 20;
 						}
 						if (!res) {
-							snprintf(nextmsg,sizeof(nextmsg), "digits/%d", remainder);
-							res = wait_file(chan,ints,nextmsg,lang);
+							snprintf(nextmsg, sizeof(nextmsg), "digits/%d", remainder);
+							res = wait_file(chan, ints, nextmsg, lang);
 						}
 					}
 				}
@@ -3349,10 +3350,10 @@
 						res = wait_file(chan, ints, "digits/hundred", lang);
 					}
 				} else if (tm.tm_min < 10) {
-					res = wait_file(chan,ints, "digits/oh",lang);
+					res = wait_file(chan, ints, "digits/oh", lang);
 					if (!res) {
-						snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_min);
-						res = wait_file(chan,ints,nextmsg,lang);
+						snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_min);
+						res = wait_file(chan, ints, nextmsg, lang);
 					}
 				} else {
 					res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
@@ -3365,7 +3366,7 @@
 					ast_copy_string(nextmsg, "digits/p-m", sizeof(nextmsg));
 				else
 					ast_copy_string(nextmsg, "digits/a-m", sizeof(nextmsg));
-				res = wait_file(chan,ints,nextmsg,lang);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'Q':
 				/* Shorthand for "Today", "Yesterday", or ABdY */
@@ -3377,17 +3378,17 @@
 					struct ast_tm tmnow;
 					time_t beg_today;
 
-					gettimeofday(&now,NULL);
+					gettimeofday(&now, NULL);
 					ast_localtime(&now, &tmnow, timezone);
 					/* This might be slightly off, if we transcend a leap second, but never more off than 1 second */
 					/* In any case, it saves not having to do ast_mktime() */
 					beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
 					if (beg_today < time) {
 						/* Today */
-						res = wait_file(chan,ints, "digits/today",lang);
+						res = wait_file(chan, ints, "digits/today", lang);
 					} else if (beg_today - 86400 < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else if (beg_today - 86400 * 6 < time) {
 						/* Within the last week */
 						res = ast_say_date_with_format_en(chan, time, ints, lang, "A", timezone);
@@ -3422,7 +3423,7 @@
 						/* Today */
 					} else if ((beg_today - 86400) < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else if (beg_today - 86400 * 6 < time) {
 						/* Within the last week */
 						res = ast_say_date_with_format_en(chan, time, ints, lang, "A", timezone);
@@ -3444,13 +3445,13 @@
 			case 'S':
 				/* Seconds */
 				if (tm.tm_sec == 0) {
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
-					res = wait_file(chan,ints,nextmsg,lang);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_sec);
+					res = wait_file(chan, ints, nextmsg, lang);
 				} else if (tm.tm_sec < 10) {
-					res = wait_file(chan,ints, "digits/oh",lang);
+					res = wait_file(chan, ints, "digits/oh", lang);
 					if (!res) {
-						snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
-						res = wait_file(chan,ints,nextmsg,lang);
+						snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_sec);
+						res = wait_file(chan, ints, nextmsg, lang);
 					}
 				} else {
 					res = ast_say_number(chan, tm.tm_sec, ints, lang, (char *) NULL);
@@ -3498,20 +3499,20 @@
 				for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++)
 					sndfile[sndoffset] = format[offset];
 				sndfile[sndoffset] = '\0';
-				res = wait_file(chan,ints,sndfile,lang);
+				res = wait_file(chan, ints, sndfile, lang);
 				break;
 			case 'A':
 			case 'a':
 				/* Sunday - Saturday */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'B':
 			case 'b':
 			case 'h':
 				/* January - December */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'm':
 				/* Month enumerated */
@@ -3535,10 +3536,10 @@
 						} else {
 						    /* year 1100 to 1999. will anybody need this?!? */
 						    /* say 1967 as 'nineteen hundred seven and sixty' */
-							snprintf(nextmsg,sizeof(nextmsg), "digits/%d", (year / 100) );
-							res = wait_file(chan,ints,nextmsg,lang);
+							snprintf(nextmsg, sizeof(nextmsg), "digits/%d", (year / 100) );
+							res = wait_file(chan, ints, nextmsg, lang);
 							if (!res) {
-								res = wait_file(chan,ints, "digits/hundred",lang);
+								res = wait_file(chan, ints, "digits/hundred", lang);
 								if (!res && year % 100 != 0) {
 									res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);	
 								}
@@ -3550,21 +3551,21 @@
 			case 'I':
 			case 'l':
 				/* 12-Hour */
-				res = wait_file(chan,ints,"digits/oclock",lang);
+				res = wait_file(chan, ints, "digits/oclock", lang);
 				if (tm.tm_hour == 0)
 					ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
 				else if (tm.tm_hour > 12)
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
 				else
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
 				if (!res) {
-					res = wait_file(chan,ints,nextmsg,lang);
+					res = wait_file(chan, ints, nextmsg, lang);
 				}
 				break;
 			case 'H':
 				/* 24-Hour, single digit hours preceeded by "oh" (0) */
 				if (tm.tm_hour < 10 && tm.tm_hour > 0) {
-					res = wait_file(chan,ints, "digits/0",lang);
+					res = wait_file(chan, ints, "digits/0", lang);
 				}
 				/* FALLTRHU */
 			case 'k':
@@ -3578,9 +3579,9 @@
 				}
 				if ( !res && format[offset + 1] == 'S' ) { /* minutes only if seconds follow (kind of a hack) */
 					if (tm.tm_min == 1) {
-						res = wait_file(chan,ints,"digits/minute",lang);
+						res = wait_file(chan, ints, "digits/minute", lang);
 					} else {
-						res = wait_file(chan,ints,"digits/minutes",lang);
+						res = wait_file(chan, ints, "digits/minutes", lang);
 					}
 				}
 				break;
@@ -3591,7 +3592,7 @@
 					ast_copy_string(nextmsg, "digits/p-m", sizeof(nextmsg));
 				else
 					ast_copy_string(nextmsg, "digits/a-m", sizeof(nextmsg));
-				res = wait_file(chan,ints,nextmsg,lang);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'Q':
 				/* Shorthand for "Today", "Yesterday", or AdBY */
@@ -3609,10 +3610,10 @@
 					beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
 					if (beg_today < time) {
 						/* Today */
-						res = wait_file(chan,ints, "digits/today",lang);
+						res = wait_file(chan, ints, "digits/today", lang);
 					} else if (beg_today - 86400 < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else {
 						res = ast_say_date_with_format_da(chan, time, ints, lang, "AdBY", timezone);
 					}
@@ -3636,7 +3637,7 @@
 						/* Today */
 					} else if ((beg_today - 86400) < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else if (beg_today - 86400 * 6 < time) {
 						/* Within the last week */
 						res = ast_say_date_with_format_da(chan, time, ints, lang, "A", timezone);
@@ -3650,11 +3651,11 @@
 				break;
 			case 'S':
 				/* Seconds */
-				res = wait_file(chan,ints, "digits/and",lang);
+				res = wait_file(chan, ints, "digits/and", lang);
 				if (!res) {
 					res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");	
 					if (!res) {
-						res = wait_file(chan,ints, "digits/seconds",lang);
+						res = wait_file(chan, ints, "digits/seconds", lang);
 					}
 				}
 				break;
@@ -3700,20 +3701,20 @@
 				for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++)
 					sndfile[sndoffset] = format[offset];
 				sndfile[sndoffset] = '\0';
-				res = wait_file(chan,ints,sndfile,lang);
+				res = wait_file(chan, ints, sndfile, lang);
 				break;
 			case 'A':
 			case 'a':
 				/* Sunday - Saturday */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'B':
 			case 'b':
 			case 'h':
 				/* January - December */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'm':
 				/* Month enumerated */
@@ -3737,10 +3738,10 @@
 						} else {
 						    /* year 1100 to 1999. will anybody need this?!? */
 						    /* say 1967 as 'neunzehn hundert sieben und sechzig' */
-							snprintf(nextmsg,sizeof(nextmsg), "digits/%d", (year / 100) );
-							res = wait_file(chan,ints,nextmsg,lang);
+							snprintf(nextmsg, sizeof(nextmsg), "digits/%d", (year / 100) );
+							res = wait_file(chan, ints, nextmsg, lang);
 							if (!res) {
-								res = wait_file(chan,ints, "digits/hundred",lang);
+								res = wait_file(chan, ints, "digits/hundred", lang);
 								if (!res && year % 100 != 0) {
 									res = ast_say_number(chan, (year % 100), ints, lang, (char *) NULL);	
 								}
@@ -3755,12 +3756,12 @@
 				if (tm.tm_hour == 0)
 					ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
 				else if (tm.tm_hour > 12)
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
 				else
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour);
-				res = wait_file(chan,ints,nextmsg,lang);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
+				res = wait_file(chan, ints, nextmsg, lang);
 				if (!res) {
-					res = wait_file(chan,ints,"digits/oclock",lang);
+					res = wait_file(chan, ints, "digits/oclock", lang);
 				}
 				break;
 			case 'H':
@@ -3768,7 +3769,7 @@
 				/* 24-Hour */
 				res = ast_say_number(chan, tm.tm_hour, ints, lang, (char *) NULL);	
 				if (!res) {
-					res = wait_file(chan,ints,"digits/oclock",lang);
+					res = wait_file(chan, ints, "digits/oclock", lang);
 				}
 				break;
 			case 'M':
@@ -3778,9 +3779,9 @@
 				}
 				if ( !res && format[offset + 1] == 'S' ) { /* minutes only if seconds follow (kind of a hack) */
 					if (tm.tm_min == 1) {
-						res = wait_file(chan,ints,"digits/minute",lang);
+						res = wait_file(chan, ints, "digits/minute", lang);
 					} else {
-						res = wait_file(chan,ints,"digits/minutes",lang);
+						res = wait_file(chan, ints, "digits/minutes", lang);
 					}
 				}
 				break;
@@ -3791,7 +3792,7 @@
 					ast_copy_string(nextmsg, "digits/p-m", sizeof(nextmsg));
 				else
 					ast_copy_string(nextmsg, "digits/a-m", sizeof(nextmsg));
-				res = wait_file(chan,ints,nextmsg,lang);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'Q':
 				/* Shorthand for "Today", "Yesterday", or AdBY */
@@ -3809,10 +3810,10 @@
 					beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
 					if (beg_today < time) {
 						/* Today */
-						res = wait_file(chan,ints, "digits/today",lang);
+						res = wait_file(chan, ints, "digits/today", lang);
 					} else if (beg_today - 86400 < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else {
 						res = ast_say_date_with_format_de(chan, time, ints, lang, "AdBY", timezone);
 					}
@@ -3836,7 +3837,7 @@
 						/* Today */
 					} else if ((beg_today - 86400) < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else if (beg_today - 86400 * 6 < time) {
 						/* Within the last week */
 						res = ast_say_date_with_format_de(chan, time, ints, lang, "A", timezone);
@@ -3850,11 +3851,11 @@
 				break;
 			case 'S':
 				/* Seconds */
-				res = wait_file(chan,ints, "digits/and",lang);
+				res = wait_file(chan, ints, "digits/and", lang);
 				if (!res) {
 					res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");	
 					if (!res) {
-						res = wait_file(chan,ints, "digits/seconds",lang);
+						res = wait_file(chan, ints, "digits/seconds", lang);
 					}
 				}
 				break;
@@ -3900,20 +3901,20 @@
 				for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++)
 					sndfile[sndoffset] = format[offset];
 				sndfile[sndoffset] = '\0';
-				res = wait_file(chan,ints,sndfile,lang);
+				res = wait_file(chan, ints, sndfile, lang);
 				break;
 			case 'A':
 			case 'a':
 				/* Sunday - Saturday */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'B':
 			case 'b':
 			case 'h':
 				/* January - December */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'm':
 				/* Month enumerated */
@@ -3933,16 +3934,16 @@
 				/* 12-Hour */
 				if (tm.tm_hour == 0)
 					ast_copy_string(nextmsg, "digits/24", sizeof(nextmsg));
-				snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'H':
 			case 'k':
 				/* 24-Hour */
 				if (tm.tm_hour == 0)
 					ast_copy_string(nextmsg, "digits/24", sizeof(nextmsg));
-				snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'M':
 			case 'N':
@@ -3967,10 +3968,10 @@
 					beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
 					if (beg_today < time) {
 						/* Today */
-						res = wait_file(chan,ints, "digits/today",lang);
+						res = wait_file(chan, ints, "digits/today", lang);
 					} else if (beg_today - 86400 < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else if (beg_today - 86400 * 6 < time) {
 						/* Within the last week */
 						res = ast_say_date_with_format_en(chan, time, ints, lang, "A", timezone);
@@ -4004,7 +4005,7 @@
 						/* Today */
 					} else if ((beg_today - 86400) < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else if (beg_today - 86400 * 6 < time) {
 						/* Within the last week */
 						res = ast_say_date_with_format_en(chan, time, ints, lang, "A", timezone);
@@ -4095,20 +4096,20 @@
 				for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++)
 					sndfile[sndoffset] = format[offset];
 				sndfile[sndoffset] = '\0';
-				res = wait_file(chan,ints,sndfile,lang);
+				res = wait_file(chan, ints, sndfile, lang);
 				break;
 			case 'A':
 			case 'a':
 				/* Sunday - Saturday */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'B':
 			case 'b':
 			case 'h':
 				/* January - December */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'd':
 			case 'e': /* Day of the month */
@@ -4147,7 +4148,7 @@
 				if ((format[offset] == 'H') && 
 				    (tm.tm_hour <10)&&(tm.tm_hour>0)
 				) { /* e.g. oh-eight */
-					res = wait_file(chan,ints, "digits/oh",lang);
+					res = wait_file(chan, ints, "digits/oh", lang);
 				}
 				
 				res = ast_say_number_full_he(chan, tm.tm_hour,
@@ -4156,7 +4157,7 @@
 				break;
 			case 'M': /* Minute */
 				res = ast_say_number_full_he(chan, tm.tm_min, 
-					ints, lang,"f", -1, -1
+					ints, lang, "f", -1, -1
 				);
 				break;
 			case 'P':
@@ -4166,7 +4167,7 @@
 					ast_copy_string(nextmsg, "digits/p-m", sizeof(nextmsg));
 				else
 					ast_copy_string(nextmsg, "digits/a-m", sizeof(nextmsg));
-				res = wait_file(chan,ints,nextmsg,lang);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'Q':
 				/* Shorthand for "Today", "Yesterday", or "date" */
@@ -4196,7 +4197,7 @@
 						}
 					} else if (beg_today - 86400 < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else if ((todo != 'Q') &&
 						(beg_today - 86400 * 6 < time))
 					{
@@ -4276,26 +4277,26 @@
 				for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++)
 					sndfile[sndoffset] = format[offset];
 				sndfile[sndoffset] = '\0';
-				snprintf(nextmsg,sizeof(nextmsg), "%s", sndfile);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "%s", sndfile);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'A':
 			case 'a':
 				/* Sunday - Saturday */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'B':
 			case 'b':
 			case 'h':
 				/* January - December */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'm':
 				/* First - Twelfth */
-				snprintf(nextmsg,sizeof(nextmsg), "digits/h-%d", tm.tm_mon +1);
-				res = wait_file(chan,ints,nextmsg,lang);
+				snprintf(nextmsg, sizeof(nextmsg), "digits/h-%d", tm.tm_mon +1);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'd':
 			case 'e':
@@ -4312,10 +4313,10 @@
 				if (tm.tm_hour == 0)
 					ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
 				else if (tm.tm_hour > 12)
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
 				else
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour);
-				res = wait_file(chan,ints,nextmsg,lang);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour);
+				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'H':
 			case 'k':
@@ -4352,10 +4353,10 @@
 					beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
 					if (beg_today < time) {
 						/* Today */
-						res = wait_file(chan,ints, "digits/today",lang);
+						res = wait_file(chan, ints, "digits/today", lang);
 					} else if (beg_today - 86400 < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else {
 						res = ast_say_date_with_format_es(chan, time, ints, lang, "'digits/es-el' Ad 'digits/es-de' B 'digits/es-de' Y", timezone);
 					}
@@ -4377,10 +4378,10 @@
 					beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
 					if (beg_today < time) {
 						/* Today */
-						res = wait_file(chan,ints, "digits/today",lang);
+						res = wait_file(chan, ints, "digits/today", lang);
 					} else if ((beg_today - 86400) < time) {
 						/* Yesterday */
-						res = wait_file(chan,ints, "digits/yesterday",lang);
+						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else if (beg_today - 86400 * 6 < time) {
 						/* Within the last week */
 						res = ast_say_date_with_format_es(chan, time, ints, lang, "A", timezone);
@@ -4395,28 +4396,28 @@
 			case 'S':
 				/* Seconds */
 				if (tm.tm_sec == 0) {
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
-					res = wait_file(chan,ints,nextmsg,lang);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_sec);
+					res = wait_file(chan, ints, nextmsg, lang);
 				} else if (tm.tm_sec < 10) {
-					res = wait_file(chan,ints, "digits/oh",lang);
+					res = wait_file(chan, ints, "digits/oh", lang);
 					if (!res) {
-						snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
-						res = wait_file(chan,ints,nextmsg,lang);
+						snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_sec);
+						res = wait_file(chan, ints, nextmsg, lang);
 					}
 				} else if ((tm.tm_sec < 21) || (tm.tm_sec % 10 == 0)) {
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
-					res = wait_file(chan,ints,nextmsg,lang);
+					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_sec);
+					res = wait_file(chan, ints, nextmsg, lang);
 				} else {
 					int ten, one;
 					ten = (tm.tm_sec / 10) * 10;
 					one = (tm.tm_sec % 10);
-					snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten);
-					res = wait_file(chan,ints,nextmsg,lang);

[... 1001 lines stripped ...]



More information about the asterisk-commits mailing list