From 0873e0d2170db76241bf5afe812acead0d531b8e Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Fri, 10 Mar 2006 12:57:12 +0000 Subject: Fixed compilation and run warnings/errors with MSVC 2005 git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@315 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/src/pjsip-simple/errno.c | 6 +++--- pjsip/src/pjsip-simple/evsub.c | 4 ++-- pjsip/src/pjsip-ua/sip_inv.c | 4 ++-- pjsip/src/pjsip/sip_auth_client.c | 2 +- pjsip/src/pjsip/sip_dialog.c | 2 +- pjsip/src/pjsip/sip_endpoint.c | 8 ++++---- pjsip/src/pjsip/sip_errno.c | 6 +++--- pjsip/src/pjsip/sip_msg.c | 6 +++--- pjsip/src/pjsip/sip_transaction.c | 2 +- pjsip/src/pjsip/sip_transport.c | 26 +++++++++++++------------- pjsip/src/pjsip/sip_transport_loop.c | 2 +- pjsip/src/pjsip/sip_transport_udp.c | 13 +++++++------ pjsip/src/pjsip/sip_ua_layer.c | 6 +++--- pjsip/src/pjsua-lib/pjsua_core.c | 4 ++-- pjsip/src/pjsua-lib/pjsua_settings.c | 9 +++++---- 15 files changed, 51 insertions(+), 49 deletions(-) (limited to 'pjsip') diff --git a/pjsip/src/pjsip-simple/errno.c b/pjsip/src/pjsip-simple/errno.c index 66d86767..a2e588d9 100644 --- a/pjsip/src/pjsip-simple/errno.c +++ b/pjsip/src/pjsip-simple/errno.c @@ -95,9 +95,9 @@ PJ_DEF(pj_str_t) pjsipsimple_strerror( pj_status_t statcode, /* Error not found. */ errstr.ptr = buf; - errstr.slen = pj_snprintf(buf, bufsize, - "Unknown error %d", - statcode); + errstr.slen = pj_ansi_snprintf(buf, bufsize, + "Unknown error %d", + statcode); return errstr; } diff --git a/pjsip/src/pjsip-simple/evsub.c b/pjsip/src/pjsip-simple/evsub.c index a526bcea..a91232c2 100644 --- a/pjsip/src/pjsip-simple/evsub.c +++ b/pjsip/src/pjsip-simple/evsub.c @@ -666,8 +666,8 @@ static pj_status_t evsub_create( pjsip_dialog *dlg, sub->timer.cb = &on_timer; /* Set name. */ - pj_snprintf(sub->obj_name, PJ_ARRAY_SIZE(sub->obj_name), - "evsub%p", sub); + pj_ansi_snprintf(sub->obj_name, PJ_ARRAY_SIZE(sub->obj_name), + "evsub%p", sub); /* Copy callback, if any: */ diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index c1142501..c0e241d1 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -395,7 +395,7 @@ PJ_DEF(pj_status_t) pjsip_inv_create_uac( pjsip_dialog *dlg, inv->cause = 0; /* Object name will use the same dialog pointer. */ - pj_snprintf(inv->obj_name, PJ_MAX_OBJ_NAME, "inv%p", dlg); + pj_ansi_snprintf(inv->obj_name, PJ_MAX_OBJ_NAME, "inv%p", dlg); /* Create negotiator if local_sdp is specified. */ if (local_sdp) { @@ -793,7 +793,7 @@ PJ_DEF(pj_status_t) pjsip_inv_create_uas( pjsip_dialog *dlg, inv->cause = 0; /* Object name will use the same dialog pointer. */ - pj_snprintf(inv->obj_name, PJ_MAX_OBJ_NAME, "inv%p", dlg); + pj_ansi_snprintf(inv->obj_name, PJ_MAX_OBJ_NAME, "inv%p", dlg); /* Parse SDP in message body, if present. */ if (msg->body) { diff --git a/pjsip/src/pjsip/sip_auth_client.c b/pjsip/src/pjsip/sip_auth_client.c index c730bb12..172ba719 100644 --- a/pjsip/src/pjsip/sip_auth_client.c +++ b/pjsip/src/pjsip/sip_auth_client.c @@ -228,7 +228,7 @@ static pj_status_t respond_digest( pj_pool_t *pool, */ cred->qop = pjsip_AUTH_STR; cred->nc.ptr = pj_pool_alloc(pool, 16); - pj_snprintf(cred->nc.ptr, 16, "%06u", nc); + pj_ansi_snprintf(cred->nc.ptr, 16, "%06u", nc); if (cnonce && cnonce->slen) { pj_strdup(pool, &cred->cnonce, cnonce); diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c index 795e103b..59b2d251 100644 --- a/pjsip/src/pjsip/sip_dialog.c +++ b/pjsip/src/pjsip/sip_dialog.c @@ -73,7 +73,7 @@ static pj_status_t create_dialog( pjsip_user_agent *ua, PJ_ASSERT_RETURN(dlg != NULL, PJ_ENOMEM); dlg->pool = pool; - pj_sprintf(dlg->obj_name, "dlg%p", dlg); + pj_ansi_sprintf(dlg->obj_name, "dlg%p", dlg); dlg->ua = ua; dlg->endpt = endpt; dlg->state = PJSIP_DIALOG_STATE_NULL; diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c index 97c7130f..848c4c57 100644 --- a/pjsip/src/pjsip/sip_endpoint.c +++ b/pjsip/src/pjsip/sip_endpoint.c @@ -900,12 +900,12 @@ PJ_DEF(void) pjsip_endpt_log_error( pjsip_endpoint *endpt, pj_str_t errstr; pj_ansi_strcpy(newformat, format); - pj_snprintf(newformat+len, sizeof(newformat)-len-1, - ": [err %d] ", error_code); + pj_ansi_snprintf(newformat+len, sizeof(newformat)-len-1, + ": [err %d] ", error_code); len += pj_ansi_strlen(newformat+len); - errstr = pjsip_strerror(error_code, newformat+len, - sizeof(newformat)-len-1); + errstr = pj_strerror( error_code, newformat+len, + sizeof(newformat)-len-1); len += errstr.slen; newformat[len] = '\0'; diff --git a/pjsip/src/pjsip/sip_errno.c b/pjsip/src/pjsip/sip_errno.c index 87909e6b..ab4d72da 100644 --- a/pjsip/src/pjsip/sip_errno.c +++ b/pjsip/src/pjsip/sip_errno.c @@ -147,9 +147,9 @@ PJ_DEF(pj_str_t) pjsip_strerror( pj_status_t statcode, } else { /* Error not found. */ errstr.ptr = buf; - errstr.slen = pj_snprintf(buf, bufsize, - "Unknown error %d", - statcode); + errstr.slen = pj_ansi_snprintf(buf, bufsize, + "Unknown error %d", + statcode); return errstr; } diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c index 0a6b2f41..0a173193 100644 --- a/pjsip/src/pjsip/sip_msg.c +++ b/pjsip/src/pjsip/sip_msg.c @@ -1715,9 +1715,9 @@ PJ_DEF(pjsip_warning_hdr*) pjsip_warning_hdr_create( pj_pool_t *pool, hvalue.ptr = pj_pool_alloc(pool, 10 + /* code */ host->slen + 2 + /* host */ text->slen + 2); /* text */ - hvalue.slen = pj_sprintf(hvalue.ptr, "%u %.*s \"%.*s\"", - code, (int)host->slen, host->ptr, - (int)text->slen, text->ptr); + hvalue.slen = pj_ansi_sprintf(hvalue.ptr, "%u %.*s \"%.*s\"", + code, (int)host->slen, host->ptr, + (int)text->slen, text->ptr); return pjsip_generic_string_hdr_create(pool, &str_warning, &hvalue); } diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c index 6f8d6b0e..8b20d8c2 100644 --- a/pjsip/src/pjsip/sip_transaction.c +++ b/pjsip/src/pjsip/sip_transaction.c @@ -862,7 +862,7 @@ static pj_status_t tsx_create( pjsip_module *tsx_user, tsx->tsx_user = tsx_user; tsx->endpt = mod_tsx_layer.endpt; - pj_sprintf(tsx->obj_name, "tsx%p", tsx); + pj_ansi_sprintf(tsx->obj_name, "tsx%p", tsx); tsx->handle_200resp = 1; tsx->retransmit_timer.id = TSX_TIMER_RETRANSMISSION; diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c index d52f96cb..2caa7cb2 100644 --- a/pjsip/src/pjsip/sip_transport.c +++ b/pjsip/src/pjsip/sip_transport.c @@ -235,7 +235,7 @@ PJ_DEF(pj_status_t) pjsip_tx_data_create( pjsip_tpmgr *mgr, tdata = pj_pool_zalloc(pool, sizeof(pjsip_tx_data)); tdata->pool = pool; tdata->mgr = mgr; - pj_snprintf(tdata->obj_name, PJ_MAX_OBJ_NAME, "tdta%p", tdata); + pj_ansi_snprintf(tdata->obj_name, PJ_MAX_OBJ_NAME, "tdta%p", tdata); status = pj_atomic_create(tdata->pool, 0, &tdata->ref_cnt); if (status != PJ_SUCCESS) { @@ -317,18 +317,18 @@ static char *get_msg_info(pj_pool_t *pool, const char *obj_name, PJ_ASSERT_RETURN(cseq != NULL, "INVALID MSG"); if (msg->type == PJSIP_REQUEST_MSG) { - len = pj_snprintf(info_buf, sizeof(info_buf), - "Request msg %.*s/cseq=%d (%s)", - (int)msg->line.req.method.name.slen, - msg->line.req.method.name.ptr, - cseq->cseq, obj_name); + len = pj_ansi_snprintf(info_buf, sizeof(info_buf), + "Request msg %.*s/cseq=%d (%s)", + (int)msg->line.req.method.name.slen, + msg->line.req.method.name.ptr, + cseq->cseq, obj_name); } else { - len = pj_snprintf(info_buf, sizeof(info_buf), - "Response msg %d/%.*s/cseq=%d (%s)", - msg->line.status.code, - (int)cseq->method.name.slen, - cseq->method.name.ptr, - cseq->cseq, obj_name); + len = pj_ansi_snprintf(info_buf, sizeof(info_buf), + "Response msg %d/%.*s/cseq=%d (%s)", + msg->line.status.code, + (int)cseq->method.name.slen, + cseq->method.name.ptr, + cseq->cseq, obj_name); } if (len < 1 || len >= sizeof(info_buf)) { @@ -367,7 +367,7 @@ PJ_DEF(char*) pjsip_rx_data_get_info(pjsip_rx_data *rdata) return rdata->msg_info.info; pj_ansi_strcpy(obj_name, "rdata"); - pj_sprintf(obj_name+5, "%p", rdata); + pj_ansi_sprintf(obj_name+5, "%p", rdata); rdata->msg_info.info = get_msg_info(rdata->tp_info.pool, obj_name, rdata->msg_info.msg); diff --git a/pjsip/src/pjsip/sip_transport_loop.c b/pjsip/src/pjsip/sip_transport_loop.c index 9ea81c16..d5ac676a 100644 --- a/pjsip/src/pjsip/sip_transport_loop.c +++ b/pjsip/src/pjsip/sip_transport_loop.c @@ -358,7 +358,7 @@ PJ_DEF(pj_status_t) pjsip_loop_start( pjsip_endpoint *endpt, loop = pj_pool_zalloc(pool, sizeof(struct loop_transport)); /* Initialize transport properties. */ - pj_sprintf(loop->base.obj_name, "loop%p", loop); + pj_ansi_sprintf(loop->base.obj_name, "loop%p", loop); loop->base.pool = pool; status = pj_atomic_create(pool, 0, &loop->base.ref_cnt); if (status != PJ_SUCCESS) diff --git a/pjsip/src/pjsip/sip_transport_udp.c b/pjsip/src/pjsip/sip_transport_udp.c index 8ab38edf..c4dad6d6 100644 --- a/pjsip/src/pjsip/sip_transport_udp.c +++ b/pjsip/src/pjsip/sip_transport_udp.c @@ -401,7 +401,7 @@ PJ_DEF(pj_status_t) pjsip_udp_transport_attach( pjsip_endpoint *endpt, tp->base.pool = pool; /* Object name. */ - pj_sprintf(tp->base.obj_name, "udp%p", tp); + pj_ansi_sprintf(tp->base.obj_name, "udp%p", tp); /* Init reference counter. */ status = pj_atomic_create(pool, 0, &tp->base.ref_cnt); @@ -445,11 +445,12 @@ PJ_DEF(pj_status_t) pjsip_udp_transport_attach( pjsip_endpoint *endpt, /* Transport info. */ tp->base.info = pj_pool_alloc(pool, 80); - pj_sprintf(tp->base.info, "udp %s:%d [published as %s:%d]", - pj_inet_ntoa(((pj_sockaddr_in*)&tp->base.local_addr)->sin_addr), - pj_ntohs(((pj_sockaddr_in*)&tp->base.local_addr)->sin_port), - tp->base.local_name.host.ptr, - tp->base.local_name.port); + pj_ansi_sprintf( + tp->base.info, "udp %s:%d [published as %s:%d]", + pj_inet_ntoa(((pj_sockaddr_in*)&tp->base.local_addr)->sin_addr), + pj_ntohs(((pj_sockaddr_in*)&tp->base.local_addr)->sin_port), + tp->base.local_name.host.ptr, + tp->base.local_name.port); /* Set endpoint. */ tp->base.endpt = endpt; diff --git a/pjsip/src/pjsip/sip_ua_layer.c b/pjsip/src/pjsip/sip_ua_layer.c index 391f2a7b..1cebea78 100644 --- a/pjsip/src/pjsip/sip_ua_layer.c +++ b/pjsip/src/pjsip/sip_ua_layer.c @@ -765,9 +765,9 @@ static void print_dialog( const char *title, else userinfo[len] = '\0'; - len = pj_snprintf(buf, size, "%s[%s] %s", - title, - (dlg->state==PJSIP_DIALOG_STATE_NULL ? " - " : + len = pj_ansi_snprintf(buf, size, "%s[%s] %s", + title, + (dlg->state==PJSIP_DIALOG_STATE_NULL ? " - " : "est"), userinfo); if (len < 1 || len >= (int)size) { diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 7ef91c74..da2ab0f2 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -896,7 +896,7 @@ pj_status_t pjsua_start(void) if (sip_uri->user.slen) { /* With the user part. */ - len = pj_snprintf(contact, sizeof(contact), + len = pj_ansi_snprintf(contact, sizeof(contact), "", (int)sip_uri->user.slen, sip_uri->user.ptr, @@ -907,7 +907,7 @@ pj_status_t pjsua_start(void) /* Without user part */ - len = pj_snprintf(contact, sizeof(contact), + len = pj_ansi_snprintf(contact, sizeof(contact), "", (int)udp_transport->local_name.host.slen, udp_transport->local_name.host.ptr, diff --git a/pjsip/src/pjsua-lib/pjsua_settings.c b/pjsip/src/pjsua-lib/pjsua_settings.c index 6da605ff..8e7709c2 100644 --- a/pjsip/src/pjsua-lib/pjsua_settings.c +++ b/pjsip/src/pjsua-lib/pjsua_settings.c @@ -18,6 +18,7 @@ */ #include #include +#include /* * pjsua_settings.c @@ -593,10 +594,10 @@ static void print_call(const char *title, else userinfo[len] = '\0'; - len = pj_snprintf(buf, size, "%s[%s] %s", - title, - pjsua_inv_state_names[inv->state], - userinfo); + len = pj_ansi_snprintf(buf, size, "%s[%s] %s", + title, + pjsua_inv_state_names[inv->state], + userinfo); if (len < 1 || len >= (int)size) { pj_ansi_strcpy(buf, "<--uri too long-->"); len = 18; -- cgit v1.2.3