Index: apps/app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.231
diff -u -r1.231 app_voicemail.c
--- apps/app_voicemail.c	15 Jul 2005 00:27:41 -0000	1.231
+++ apps/app_voicemail.c	15 Jul 2005 04:05:50 -0000
@@ -417,10 +417,10 @@
 	} else if (!strcasecmp(var, "maxmsg")) {
 		vmu->maxmsg = atoi(value);
  		if (vmu->maxmsg <= 0) {
-			ast_log(LOG_WARNING, "Invalid number of messages per folder maxmsg=%s. Using default value %i\n", value, MAXMSG);
+			ast_log(LOG_WARNING, "Invalid number of messages per folder maxmsg=%s. Using default value %d\n", value, MAXMSG);
 			vmu->maxmsg = MAXMSG;
 		} else if (vmu->maxmsg > MAXMSGLIMIT) {
-			ast_log(LOG_WARNING, "Maximum number of messages per folder is %i. Cannot accept value maxmsg=%s\n", MAXMSGLIMIT, value);
+			ast_log(LOG_WARNING, "Maximum number of messages per folder is %d. Cannot accept value maxmsg=%s\n", MAXMSGLIMIT, value);
 			vmu->maxmsg = MAXMSGLIMIT;
 		}
 	} else if (!strcasecmp(var, "options")) {
@@ -5220,7 +5220,7 @@
 			if (i <= 0) {
 				ast_log(LOG_WARNING, "Invalid number of messages per folder '%s'\n", maxmsgstr);
 			} else if (i > MAXMSGLIMIT) {
-				ast_log(LOG_WARNING, "Maximum number of messages per folder is %i. Cannot accept value '%s'\n", MAXMSGLIMIT, maxmsgstr);
+				ast_log(LOG_WARNING, "Maximum number of messages per folder is %d. Cannot accept value '%s'\n", MAXMSGLIMIT, maxmsgstr);
 			} else {
 				vmu->maxmsg = i;
 			}
@@ -5523,10 +5523,10 @@
 		} else {
 			maxmsg = atoi(maxmsgstr);
 			if (maxmsg <= 0) {
-				ast_log(LOG_WARNING, "Invalid number of messages per folder '%s'. Using default value %i\n", maxmsgstr, MAXMSG);
+				ast_log(LOG_WARNING, "Invalid number of messages per folder '%s'. Using default value %d\n", maxmsgstr, MAXMSG);
 				maxmsg = MAXMSG;
 			} else if (maxmsg > MAXMSGLIMIT) {
-				ast_log(LOG_WARNING, "Maximum number of messages per folder is %i. Cannot accept value '%s'\n", MAXMSGLIMIT, maxmsgstr);
+				ast_log(LOG_WARNING, "Maximum number of messages per folder is %d. Cannot accept value '%s'\n", MAXMSGLIMIT, maxmsgstr);
 				maxmsg = MAXMSGLIMIT;
 			}
 		}
Index: apps/app_rpt.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_rpt.c,v
retrieving revision 1.36
diff -u -r1.36 app_rpt.c
--- apps/app_rpt.c	10 Jul 2005 03:13:42 -0000	1.36
+++ apps/app_rpt.c	15 Jul 2005 05:14:12 -0000
@@ -379,7 +379,7 @@
 int	ret;
 
 	if (str == NULL) return -1;
-	if (sscanf(str,"%i",&ret) != 1) return -1;
+	if (sscanf(str,"%d",&ret) != 1) return -1;
 	return ret;
 }
 
Index: funcs/func_math.c
===================================================================
RCS file: /usr/cvsroot/asterisk/funcs/func_math.c,v
retrieving revision 1.1
diff -u -r1.1 func_math.c
--- funcs/func_math.c	9 Jun 2005 22:59:08 -0000	1.1
+++ funcs/func_math.c	15 Jul 2005 04:10:31 -0000
@@ -205,7 +205,7 @@
 	    if (type_of_result == FLOAT_RESULT)
 		    snprintf(user_result, sizeof(user_result), "%f", ftmp);
 	    else if (type_of_result == INT_RESULT)
-		    snprintf(user_result, sizeof(user_result), "%i", (int) ftmp);
+		    snprintf(user_result, sizeof(user_result), "%d", (int) ftmp);
 	    else if (type_of_result == HEX_RESULT)
 		snprintf(user_result, sizeof(user_result), "%x", (unsigned int) ftmp);
 	    else if (type_of_result == CHAR_RESULT)