diff options
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_agent.c | 4 | ||||
-rw-r--r-- | channels/chan_iax2.c | 16 | ||||
-rw-r--r-- | channels/chan_sip.c | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 57e5f9a71..2a416f32e 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1445,11 +1445,11 @@ static int action_agents(struct mansession *s, struct message *m) "Name: %s\r\n" "Status: %s\r\n" "LoggedInChan: %s\r\n" - "LoggedInTime: %ld\r\n" + "LoggedInTime: %d\r\n" "TalkingTo: %s\r\n" "%s" "\r\n", - p->agent, username, status, loginChan, p->loginstart, talkingtoChan, idText); + p->agent, username, status, loginChan, (int)p->loginstart, talkingtoChan, idText); ast_mutex_unlock(&p->lock); p = p->next; } 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; diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f1d549b57..10745916e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1594,7 +1594,7 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin, time_t nowtime; time(&nowtime); nowtime += expirey; - snprintf(regseconds, sizeof(regseconds), "%ld", nowtime); /* Expiration time */ + snprintf(regseconds, sizeof(regseconds), "%d", (int)nowtime); /* Expiration time */ ast_inet_ntoa(ipaddr, sizeof(ipaddr), sin->sin_addr); snprintf(port, sizeof(port), "%d", ntohs(sin->sin_port)); } @@ -12069,7 +12069,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int } if (realtime && !strcasecmp(v->name, "regseconds")) { - if (sscanf(v->value, "%li", ®seconds) != 1) + if (sscanf(v->value, "%i", (int *)®seconds) != 1) regseconds = 0; } else if (realtime && !strcasecmp(v->name, "ipaddr") && !ast_strlen_zero(v->value) ) { inet_aton(v->value, &(peer->addr.sin_addr)); @@ -12232,7 +12232,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int destroy_association(peer); memset(&peer->addr, 0, sizeof(peer->addr)); if (option_debug) - ast_log(LOG_DEBUG, "Bah, we're expired (%ld/%ld/%ld)!\n", nowtime - regseconds, regseconds, nowtime); + ast_log(LOG_DEBUG, "Bah, we're expired (%d/%d/%d)!\n", (int)(nowtime - regseconds), (int)regseconds, (int)nowtime); } } ast_copy_flags(peer, &peerflags, mask.flags); |