[Asterisk-cvs] asterisk/channels chan_iax2.c,1.264,1.265

[kpfleming at lists.digium.com]

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

Modified Files:
	chan_iax2.c 
Log Message:
fix various compiler warnings (bug #3938)


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- chan_iax2.c	1 Apr 2005 15:52:26 -0000	1.264
+++ chan_iax2.c	3 Apr 2005 21:16:00 -0000	1.265
@@ -1395,6 +1395,7 @@
 	return 0;
 }
 
+#ifndef NEWJB
 static int do_deliver(void *data)
 {
 	/* Locking version of __do_deliver */
@@ -1406,6 +1407,7 @@
 	ast_mutex_unlock(&iaxsl[callno]);
 	return res;
 }
+#endif /* NEWJB */
 
 static int handle_error(void)
 {
@@ -4138,7 +4140,11 @@
 static int iax2_show_firmware(int fd, int argc, char *argv[])
 {
 #define FORMAT2 "%-15.15s  %-15.15s %-15.15s\n"
+#if !defined(__FreeBSD__)
 #define FORMAT "%-15.15s  %-15d %-15d\n"
+#else /* __FreeBSD__ */
+#define FORMAT "%-15.15s  %-15d %-15ld\n"
+#endif /* __FreeBSD__ */
 	struct iax_firmware *cur;
 	if ((argc != 3) && (argc != 4))
 		return RESULT_SHOWUSAGE;
@@ -4148,7 +4154,7 @@
 	for (cur = waresl.wares;cur;cur = cur->next) {
 		if ((argc == 3) || (!strcasecmp(argv[3], cur->fwh->devname))) 
 			ast_cli(fd, FORMAT, cur->fwh->devname, ntohs(cur->fwh->version),
-						ntohl(cur->fwh->datalen));
+				ntohl(cur->fwh->datalen));
 	}
 	ast_mutex_unlock(&waresl.lock);
 	return RESULT_SUCCESS;