[Asterisk-cvs] asterisk/apps app_festival.c,1.20,1.21 app_milliwatt.c,1.7,1.8 app_sms.c,1.4,1.5 app_voicemail.c,1.110,1.111

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv30795/apps

Modified Files:
	app_festival.c app_milliwatt.c app_sms.c app_voicemail.c 
Log Message:
x86-64 compile fixes and cleanups


Index: app_festival.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_festival.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- app_festival.c	9 May 2004 07:51:44 -0000	1.20
+++ app_festival.c	13 Jun 2004 21:25:10 -0000	1.21
@@ -199,7 +199,7 @@
 				needed = f->samples * 2;
 				if (needed > sizeof(myf.frdata)) {
 					ast_log(LOG_WARNING, "Only able to deliver %d of %d requested samples\n",
-						sizeof(myf.frdata) / 2, needed/2);
+						(int)sizeof(myf.frdata) / 2, needed/2);
 					needed = sizeof(myf.frdata);
 				}
 				res = read(fds[0], myf.frdata, needed);
@@ -374,7 +374,7 @@
     			}
     		} else {
     			read(fdesc,&strln,sizeof(int));
-    			ast_log(LOG_DEBUG,"Cache file exists, strln=%d, strlen=%d\n",strln,strlen((char *)data));
+    			ast_log(LOG_DEBUG,"Cache file exists, strln=%d, strlen=%d\n",strln,(int)strlen((char *)data));
     			if (strlen((char *)data)==strln) {
     				ast_log(LOG_DEBUG,"Size OK\n");
     				read(fdesc,&bigstring,strln);

Index: app_milliwatt.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_milliwatt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_milliwatt.c	6 Apr 2004 22:17:31 -0000	1.7
+++ app_milliwatt.c	13 Jun 2004 21:25:10 -0000	1.8
@@ -64,7 +64,7 @@
 
 	if (len > sizeof(buf))
 	{
-		ast_log(LOG_WARNING,"Only doing %d bytes (%d bytes requested)\n",sizeof(buf),len);
+		ast_log(LOG_WARNING,"Only doing %d bytes (%d bytes requested)\n",(int)sizeof(buf),len);
 		len = sizeof(buf);
 	}
 	waste[0] = 0; /* make compiler happy */

Index: app_sms.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_sms.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- app_sms.c	12 Jun 2004 14:53:53 -0000	1.4
+++ app_sms.c	13 Jun 2004 21:25:10 -0000	1.5
@@ -860,7 +860,7 @@
 
   if (len > sizeof (buf))
     {
-      ast_log (LOG_WARNING, "Only doing %d bytes (%d bytes requested)\n", sizeof (buf) / sizeof (signed short), len);
+      ast_log (LOG_WARNING, "Only doing %d bytes (%d bytes requested)\n", (int)(sizeof (buf) / sizeof (signed short)), len);
       len = sizeof (buf);
       samples = len / 2;
     }

Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- app_voicemail.c	11 Jun 2004 21:11:22 -0000	1.110
+++ app_voicemail.c	13 Jun 2004 21:25:10 -0000	1.111
@@ -2953,7 +2953,7 @@
 				break;
 			}
 			vm_change_password(vmu,newpassword);
-			ast_log(LOG_DEBUG,"User %s set password to %s of length %i\n",vms->username,newpassword,strlen(newpassword));
+			ast_log(LOG_DEBUG,"User %s set password to %s of length %i\n",vms->username,newpassword,(int)strlen(newpassword));
 			cmd = play_and_wait(chan,"vm-passchanged");
 			break;
 		case '*':