diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_agent.c | 2 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 6 | ||||
| -rw-r--r-- | channels/chan_misdn.c | 2 | ||||
| -rw-r--r-- | channels/chan_sip.c | 10 | ||||
| -rw-r--r-- | channels/chan_vpb.cc | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 6c3b838c0..78bdb5a20 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1106,7 +1106,7 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state) } #endif if (p->pending) - tmp = ast_channel_alloc(0, state, 0, 0, "", p->chan ? p->chan->exten:"", p->chan ? p->chan->context:"", 0, "Agent/P%s-%d", p->agent, ast_random() & 0xffff); + tmp = ast_channel_alloc(0, state, 0, 0, "", p->chan ? p->chan->exten:"", p->chan ? p->chan->context:"", 0, "Agent/P%s-%d", p->agent, (int) ast_random() & 0xffff); else tmp = ast_channel_alloc(0, state, 0, 0, "", p->chan ? p->chan->exten:"", p->chan ? p->chan->context:"", 0, "Agent/%s", p->agent); if (!tmp) { diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 378550a99..bbc08d9e1 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -979,7 +979,7 @@ static void iax_error_output(const char *data) ast_log(LOG_WARNING, "%s", data); } -static void __attribute__((format (printf, 1, 2))) jb_error_output(const char *fmt, ...) +static void __attribute__((format(printf, 1, 2))) jb_error_output(const char *fmt, ...) { va_list args; char buf[1024]; @@ -991,7 +991,7 @@ static void __attribute__((format (printf, 1, 2))) jb_error_output(const char *f ast_log(LOG_ERROR, "%s", buf); } -static void __attribute__((format (printf, 1, 2))) jb_warning_output(const char *fmt, ...) +static void __attribute__((format(printf, 1, 2))) jb_warning_output(const char *fmt, ...) { va_list args; char buf[1024]; @@ -1003,7 +1003,7 @@ static void __attribute__((format (printf, 1, 2))) jb_warning_output(const char ast_log(LOG_WARNING, "%s", buf); } -static void __attribute__((format (printf, 1, 2))) jb_debug_output(const char *fmt, ...) +static void __attribute__((format(printf, 1, 2))) jb_debug_output(const char *fmt, ...) { va_list args; char buf[1024]; diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 4b521c464..c3dde3cf6 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -285,7 +285,7 @@ static pthread_t misdn_tasks_thread; static int *misdn_ports; static void chan_misdn_log(int level, int port, char *tmpl, ...) - __attribute__ ((format (printf, 3, 4))); + __attribute__((format(printf, 3, 4))); static struct ast_channel *misdn_new(struct chan_list *cl, int state, char *exten, char *callerid, int format, int port, int c); static void send_digit_to_chan(struct chan_list *cl, char digit ); diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 6c7bf1970..a60efc524 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2895,7 +2895,7 @@ static struct ast_udptl_protocol sip_udptl = { }; static void append_history_full(struct sip_pvt *p, const char *fmt, ...) - __attribute__ ((format (printf, 2, 3))); + __attribute__((format(printf, 2, 3))); /*! \brief Convert transfer status to string */ @@ -3206,9 +3206,9 @@ static void build_via(struct sip_pvt *p) /* z9hG4bK is a magic cookie. See RFC 3261 section 8.1.1.7 */ ast_string_field_build(p, via, "SIP/2.0/%s %s:%d;branch=z9hG4bK%08x%s", - get_transport_pvt(p), - ast_inet_ntoa(p->ourip.sin_addr), - ntohs(p->ourip.sin_port), p->branch, rport); + get_transport_pvt(p), + ast_inet_ntoa(p->ourip.sin_addr), + ntohs(p->ourip.sin_port), (int) p->branch, rport); } /*! \brief NAT fix - decide which IP address to use for Asterisk server? @@ -3269,7 +3269,7 @@ static void ast_sip_ouraddrfor(struct in_addr *them, struct sockaddr_in *us) } /*! \brief Append to SIP dialog history with arg list */ -static __attribute__((format (printf, 2, 0))) void append_history_va(struct sip_pvt *p, const char *fmt, va_list ap) +static __attribute__((format(printf, 2, 0))) void append_history_va(struct sip_pvt *p, const char *fmt, va_list ap) { char buf[80], *c = buf; /* max history length */ struct sip_history *hist; diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index f72231276..e611ab097 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -2478,7 +2478,7 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state st } ast_verb(4, "%s: New call for context [%s]\n", me->dev, context); - tmp = ast_channel_alloc(1, state, 0, 0, "", me->ext, me->context, 0, me->dev); + tmp = ast_channel_alloc(1, state, 0, 0, "", me->ext, me->context, 0, "%s", me->dev); if (tmp) { if (use_ast_ind == 1){ tmp->tech = &vpb_tech_indicate; |