From c5acba479d47d47b0809d2627f22762e77a7669f Mon Sep 17 00:00:00 2001 From: russell Date: Mon, 26 Dec 2005 18:19:12 +0000 Subject: cast time_t to an int in printf/scanf (issue #5635) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@7634 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_iax2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'channels/chan_iax2.c') diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 567d9c426..f5a06f232 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2599,7 +2599,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in break; } } else if (!strcasecmp(tmp->name, "regseconds")) { - if (sscanf(tmp->value, "%li", ®seconds) != 1) + if (sscanf(tmp->value, "%i", (int *)®seconds) != 1) regseconds = 0; } else if (!strcasecmp(tmp->name, "ipaddr")) { inet_aton(tmp->value, &(peer->addr.sin_addr)); @@ -2638,13 +2638,13 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in if ((nowtime - regseconds) > IAX_DEFAULT_REG_EXPIRE) { memset(&peer->addr, 0, sizeof(peer->addr)); if (option_debug) - ast_log(LOG_DEBUG, "realtime_peer: Bah, '%s' is expired (%ld/%ld/%ld)!\n", - peername, nowtime - regseconds, regseconds, nowtime); + ast_log(LOG_DEBUG, "realtime_peer: Bah, '%s' is expired (%d/%d/%d)!\n", + peername, (int)(nowtime - regseconds), (int)regseconds, (int)nowtime); } else { if (option_debug) - ast_log(LOG_DEBUG, "realtime_peer: Registration for '%s' still active (%ld/%ld/%ld)!\n", - peername, nowtime - regseconds, regseconds, nowtime); + ast_log(LOG_DEBUG, "realtime_peer: Registration for '%s' still active (%d/%d/%d)!\n", + peername, (int)(nowtime - regseconds), (int)regseconds, (int)nowtime); } } @@ -2700,7 +2700,7 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin) time_t nowtime; time(&nowtime); - snprintf(regseconds, sizeof(regseconds), "%ld", nowtime); + snprintf(regseconds, sizeof(regseconds), "%d", (int)nowtime); ast_inet_ntoa(ipaddr, sizeof(ipaddr), sin->sin_addr); snprintf(port, sizeof(port), "%d", ntohs(sin->sin_port)); ast_update_realtime("iaxpeers", "name", peername, "ipaddr", ipaddr, "port", port, "regseconds", regseconds, NULL); @@ -4285,7 +4285,7 @@ static int iax2_show_firmware(int fd, int argc, char *argv[]) #if !defined(__FreeBSD__) #define FORMAT "%-15.15s %-15d %-15d\n" #else /* __FreeBSD__ */ -#define FORMAT "%-15.15s %-15d %-15ld\n" +#define FORMAT "%-15.15s %-15d %-15d\n" /* XXX 2.95 ? */ #endif /* __FreeBSD__ */ struct iax_firmware *cur; if ((argc != 3) && (argc != 4)) @@ -4296,7 +4296,7 @@ static int iax2_show_firmware(int fd, int argc, char *argv[]) for (cur = waresl.wares;cur;cur = cur->next) { if ((argc == 3) || (!strcasecmp(argv[3], (char *)cur->fwh->devname))) ast_cli(fd, FORMAT, cur->fwh->devname, ntohs(cur->fwh->version), - ntohl(cur->fwh->datalen)); + (int)ntohl(cur->fwh->datalen)); } ast_mutex_unlock(&waresl.lock); return RESULT_SUCCESS; -- cgit v1.2.3