From 66bbd8a70dbc2bdb19cc96f01dc056c018be91df Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Thu, 2 Mar 2006 21:26:09 +0000 Subject: Fixed compilation warnings and errors in pjsip-perf git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@271 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/src/pj/config.c | 2 +- pjmedia/src/pjmedia/sdp.c | 21 +++++++++++---------- pjsip-apps/src/pjsip-perf/handler_call.c | 11 ++++++++--- pjsip-apps/src/pjsip-perf/handler_options.c | 4 ++++ pjsip-apps/src/pjsip-perf/main.c | 3 +++ 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/pjlib/src/pj/config.c b/pjlib/src/pj/config.c index 385baad7..f554b26b 100644 --- a/pjlib/src/pj/config.c +++ b/pjlib/src/pj/config.c @@ -21,7 +21,7 @@ #include static const char *id = "config.c"; -const char *PJ_VERSION = "0.5.2"; +const char *PJ_VERSION = "0.5.3"; PJ_DEF(void) pj_dump_config(void) { diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c index 79f6cd98..a593b745 100644 --- a/pjmedia/src/pjmedia/sdp.c +++ b/pjmedia/src/pjmedia/sdp.c @@ -567,7 +567,7 @@ PJ_DEF(pjmedia_sdp_media*) pjmedia_sdp_media_clone( pj_strdup (pool, &m->desc.transport, &rhs->desc.transport); m->desc.fmt_count = rhs->desc.fmt_count; for (i=0; idesc.fmt_count; ++i) - m->desc.fmt[i] = rhs->desc.fmt[i]; + pj_strdup(pool, &m->desc.fmt[i], &rhs->desc.fmt[i]); if (rhs->conn) { m->conn = pjmedia_sdp_conn_clone (pool, rhs->conn); @@ -678,6 +678,16 @@ static int print_session(const pjmedia_sdp_session *ses, *p++ = '\r'; *p++ = '\n'; + /* Connection line (c=) if exist. */ + if (ses->conn) { + printed = print_connection_info(ses->conn, p, end-p); + if (printed < 1) { + return -1; + } + p += printed; + } + + /* Time */ if ((end-p) < 24) { return -1; @@ -692,15 +702,6 @@ static int print_session(const pjmedia_sdp_session *ses, *p++ = '\r'; *p++ = '\n'; - /* Connection line (c=) if exist. */ - if (ses->conn) { - printed = print_connection_info(ses->conn, p, end-p); - if (printed < 1) { - return -1; - } - p += printed; - } - /* Print all attribute (a=) lines. */ for (i=0; iattr_count; ++i) { printed = print_attr(ses->attr[i], p, end-p); diff --git a/pjsip-apps/src/pjsip-perf/handler_call.c b/pjsip-apps/src/pjsip-perf/handler_call.c index 469d72c8..5683ffa9 100644 --- a/pjsip-apps/src/pjsip-perf/handler_call.c +++ b/pjsip-apps/src/pjsip-perf/handler_call.c @@ -133,7 +133,7 @@ static pj_bool_t mod_call_on_rx_request(pjsip_rx_data *rdata) /* Create dialog. */ status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, NULL, &dlg); if (status != PJ_SUCCESS) { - pjsip_dlg_respond(dlg, rdata, 500, NULL); + pjsip_dlg_respond(dlg, rdata, 500, NULL, NULL, NULL); return PJ_TRUE; } @@ -141,7 +141,7 @@ static pj_bool_t mod_call_on_rx_request(pjsip_rx_data *rdata) status = pjsip_inv_create_uas( dlg, rdata, local_sdp, 0, &inv); if (status != PJ_SUCCESS) { - pjsip_dlg_respond(dlg, rdata, 500, NULL); + pjsip_dlg_respond(dlg, rdata, 500, NULL, NULL, NULL); // TODO: Need to delete dialog return PJ_TRUE; @@ -160,7 +160,7 @@ static pj_bool_t mod_call_on_rx_request(pjsip_rx_data *rdata) app_perror(THIS_FILE, "Unable to create 200 response", status); - pjsip_dlg_respond(dlg, rdata, 500, NULL); + pjsip_dlg_respond(dlg, rdata, 500, NULL, NULL, NULL); // TODO: Need to delete dialog @@ -271,6 +271,9 @@ static void bye_callback( pj_timer_heap_t *ht, pj_timer_entry *e) pjsip_tx_data *tdata; pj_status_t status; + PJ_UNUSED_ARG(ht); + PJ_UNUSED_ARG(e); + e->id = 0; status = pjsip_inv_end_session(call_data->inv, PJSIP_SC_REQUEST_TIMEOUT, @@ -296,6 +299,8 @@ static void call_on_state_changed( pjsip_inv_session *inv, pjsip_event *e) { struct call_data *call_data; + PJ_UNUSED_ARG(e); + call_data = inv->mod_data[mod_call.id]; if (call_data == NULL) return; diff --git a/pjsip-apps/src/pjsip-perf/handler_options.c b/pjsip-apps/src/pjsip-perf/handler_options.c index b0b1bcfe..bd14a724 100644 --- a/pjsip-apps/src/pjsip-perf/handler_options.c +++ b/pjsip-apps/src/pjsip-perf/handler_options.c @@ -115,6 +115,10 @@ pj_status_t options_spawn_test(const pj_str_t *target, PJ_LOG(5,(THIS_FILE,"Sending OPTIONS request..")); + PJ_UNUSED_ARG(route_set); + PJ_UNUSED_ARG(cred_cnt); + PJ_UNUSED_ARG(cred); + status = pjsip_endpt_create_request( settings.endpt, &pjsip_options_method, target, diff --git a/pjsip-apps/src/pjsip-perf/main.c b/pjsip-apps/src/pjsip-perf/main.c index b0eb284c..4b430179 100644 --- a/pjsip-apps/src/pjsip-perf/main.c +++ b/pjsip-apps/src/pjsip-perf/main.c @@ -596,6 +596,9 @@ static void spawn_batch( pj_timer_heap_t *timer_heap, unsigned i; + PJ_UNUSED_ARG(timer_heap); + PJ_UNUSED_ARG(entry); + if (!pj_list_empty(&sess->free_list)) { batch = sess->free_list.next; pj_list_erase(batch); -- cgit v1.2.3