[Asterisk-cvs] asterisk/res res_crypto.c,1.7,1.8 res_musiconhold.c,1.29,1.30

[markster at lists.digium.com]

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

Modified Files:
	res_crypto.c res_musiconhold.c 
Log Message:
x86-64 compile fixes and cleanups


Index: res_crypto.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_crypto.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- res_crypto.c	9 Jun 2004 01:45:08 -0000	1.7
+++ res_crypto.c	13 Jun 2004 21:25:10 -0000	1.8
@@ -405,7 +405,7 @@
 	}
 
 	if (siglen != sizeof(dsig)) {
-		ast_log(LOG_WARNING, "Unexpected signature length %d, expecting %d\n", siglen, sizeof(dsig));
+		ast_log(LOG_WARNING, "Unexpected signature length %d, expecting %d\n", (int)siglen, (int)sizeof(dsig));
 		return -1;
 	}
 
@@ -431,7 +431,7 @@
 	/* Decode signature */
 	res = base64decode(dsig, sig, sizeof(dsig));
 	if (res != sizeof(dsig)) {
-		ast_log(LOG_WARNING, "Signature improper length (expect %d, got %d)\n", sizeof(dsig), res);
+		ast_log(LOG_WARNING, "Signature improper length (expect %d, got %d)\n", (int)sizeof(dsig), (int)res);
 		return -1;
 	}
 

Index: res_musiconhold.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- res_musiconhold.c	9 Jun 2004 01:45:08 -0000	1.29
+++ res_musiconhold.c	13 Jun 2004 21:25:10 -0000	1.30
@@ -454,7 +454,7 @@
 
 	len = samples * 2;
 	if (len > sizeof(buf) - AST_FRIENDLY_OFFSET) {
-		ast_log(LOG_WARNING, "Only doing %d of %d requested bytes on %s\n", sizeof(buf), len, chan->name);
+		ast_log(LOG_WARNING, "Only doing %d of %d requested bytes on %s\n", (int)sizeof(buf), (int)len, chan->name);
 		len = sizeof(buf) - AST_FRIENDLY_OFFSET;
 	}
 	res = read(moh->pipe[0], buf + AST_FRIENDLY_OFFSET/2, len);