diff options
Diffstat (limited to 'pjsip-apps/src/samples')
-rw-r--r-- | pjsip-apps/src/samples/clidemo.c | 5 | ||||
-rw-r--r-- | pjsip-apps/src/samples/httpdemo.c | 8 | ||||
-rw-r--r-- | pjsip-apps/src/samples/mix.c | 6 | ||||
-rw-r--r-- | pjsip-apps/src/samples/pcaputil.c | 2 | ||||
-rw-r--r-- | pjsip-apps/src/samples/pjsip-perf.c | 8 | ||||
-rw-r--r-- | pjsip-apps/src/samples/siprtp.c | 3 | ||||
-rw-r--r-- | pjsip-apps/src/samples/stateful_proxy.c | 12 |
7 files changed, 19 insertions, 25 deletions
diff --git a/pjsip-apps/src/samples/clidemo.c b/pjsip-apps/src/samples/clidemo.c index 7de31c90..da9a9339 100644 --- a/pjsip-apps/src/samples/clidemo.c +++ b/pjsip-apps/src/samples/clidemo.c @@ -219,7 +219,7 @@ on_return: /* * Simple implementation of app_main() for console targets */ -pj_status_t app_main(pj_cli_t *cli) +pj_status_t app_main(pj_cli_t *c) { pj_status_t status; pj_cli_sess *sess; @@ -231,7 +231,7 @@ pj_status_t app_main(pj_cli_t *cli) /* * Create the console front end */ - status = pj_cli_console_create(cli, &console_cfg, &sess, NULL); + status = pj_cli_console_create(c, &console_cfg, &sess, NULL); if (status != PJ_SUCCESS) return status; @@ -242,7 +242,6 @@ pj_status_t app_main(pj_cli_t *cli) */ for (;;) { char cmdline[PJ_CLI_MAX_CMDBUF]; - pj_status_t status; status = pj_cli_console_process(sess, &cmdline[0], sizeof(cmdline)); if (status != PJ_SUCCESS) diff --git a/pjsip-apps/src/samples/httpdemo.c b/pjsip-apps/src/samples/httpdemo.c index a1190111..ec49a0f9 100644 --- a/pjsip-apps/src/samples/httpdemo.c +++ b/pjsip-apps/src/samples/httpdemo.c @@ -43,11 +43,11 @@ static FILE *f = NULL; //#define VERBOSE #define THIS_FILE "http_demo" -static void on_response(pj_http_req *http_req, const pj_http_resp *resp) +static void on_response(pj_http_req *req, const pj_http_resp *resp) { unsigned i; - PJ_UNUSED_ARG(http_req); + PJ_UNUSED_ARG(req); PJ_LOG(3,(THIS_FILE, "%.*s %d %.*s", (int)resp->version.slen, resp->version.ptr, resp->status_code, (int)resp->reason.slen, resp->reason.ptr)); @@ -65,9 +65,9 @@ static void on_response(pj_http_req *http_req, const pj_http_resp *resp) } } -static void on_send_data(pj_http_req *http_req, void **data, pj_size_t *size) +static void on_send_data(pj_http_req *req, void **data, pj_size_t *size) { - PJ_UNUSED_ARG(http_req); + PJ_UNUSED_ARG(req); PJ_UNUSED_ARG(size); PJ_UNUSED_ARG(data); } diff --git a/pjsip-apps/src/samples/mix.c b/pjsip-apps/src/samples/mix.c index cc139f76..da2dd6d8 100644 --- a/pjsip-apps/src/samples/mix.c +++ b/pjsip-apps/src/samples/mix.c @@ -195,14 +195,14 @@ int main(int argc, char *argv[]) processed = 0; while (processed < longest + clock_rate * APPEND * 2 / 1000) { pj_int16_t framebuf[PTIME * 48000 / 1000]; - pjmedia_port *cp = pjmedia_conf_get_master_port(conf); + pjmedia_port *mp = pjmedia_conf_get_master_port(conf); pjmedia_frame frame; frame.buf = framebuf; - frame.size = PJMEDIA_PIA_SPF(&cp->info) * 2; + frame.size = PJMEDIA_PIA_SPF(&mp->info) * 2; pj_assert(frame.size <= sizeof(framebuf)); - CHECK( pjmedia_port_get_frame(cp, &frame) ); + CHECK( pjmedia_port_get_frame(mp, &frame) ); if (frame.type != PJMEDIA_FRAME_TYPE_AUDIO) { pj_bzero(frame.buf, frame.size); diff --git a/pjsip-apps/src/samples/pcaputil.c b/pjsip-apps/src/samples/pcaputil.c index 86a58010..ad1022f7 100644 --- a/pjsip-apps/src/samples/pcaputil.c +++ b/pjsip-apps/src/samples/pcaputil.c @@ -371,8 +371,6 @@ static void pcap2wav(const pj_str_t *codec, /* Decode and write to WAV file */ samples_cnt = 0; for (i=0; i<frame_cnt; ++i) { - pjmedia_frame pcm_frame; - pcm_frame.buf = pcm; pcm_frame.size = samples_per_frame * 2; diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c index 974e9337..10bde943 100644 --- a/pjsip-apps/src/samples/pjsip-perf.c +++ b/pjsip-apps/src/samples/pjsip-perf.c @@ -967,12 +967,12 @@ static void call_on_media_update( pjsip_inv_session *inv, { if (status != PJ_SUCCESS) { pjsip_tx_data *tdata; - pj_status_t status; + pj_status_t status2; - status = pjsip_inv_end_session(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE, + status2 = pjsip_inv_end_session(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE, NULL, &tdata); - if (status == PJ_SUCCESS && tdata) - status = pjsip_inv_send_msg(inv, tdata); + if (status2 == PJ_SUCCESS && tdata) + status2 = pjsip_inv_send_msg(inv, tdata); } } diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index 1bee1f5c..262e2033 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -1059,7 +1059,6 @@ static pj_status_t create_sdp( pj_pool_t *pool, { pjmedia_sdp_rtpmap rtpmap; - pjmedia_sdp_attr *attr; char ptstr[10]; sprintf(ptstr, "%d", app.audio_codec.pt); @@ -2125,8 +2124,6 @@ int main(int argc, char *argv[]) /* If URL is specified, then make call immediately */ if (app.uri_to_call.slen) { - unsigned i; - PJ_LOG(3,(THIS_FILE, "Making %d calls to %s..", app.max_calls, app.uri_to_call.ptr)); diff --git a/pjsip-apps/src/samples/stateful_proxy.c b/pjsip-apps/src/samples/stateful_proxy.c index 3e870369..600ca942 100644 --- a/pjsip-apps/src/samples/stateful_proxy.c +++ b/pjsip-apps/src/samples/stateful_proxy.c @@ -247,7 +247,7 @@ static pj_bool_t proxy_on_rx_request( pjsip_rx_data *rdata ) } else { /* This is CANCEL request */ pjsip_transaction *invite_uas; - struct uas_data *uas_data; + struct uas_data *uas_data2; pj_str_t key; /* Find the UAS INVITE transaction */ @@ -269,17 +269,17 @@ static pj_bool_t proxy_on_rx_request( pjsip_rx_data *rdata ) * The UAS INVITE transaction will get final response when * we receive final response from the UAC INVITE transaction. */ - uas_data = (struct uas_data*) invite_uas->mod_data[mod_tu.id]; - if (uas_data->uac_tsx && uas_data->uac_tsx->status_code < 200) { + uas_data2 = (struct uas_data*) invite_uas->mod_data[mod_tu.id]; + if (uas_data2->uac_tsx && uas_data2->uac_tsx->status_code < 200) { pjsip_tx_data *cancel; - pj_grp_lock_acquire(uas_data->uac_tsx->grp_lock); + pj_grp_lock_acquire(uas_data2->uac_tsx->grp_lock); - pjsip_endpt_create_cancel(global.endpt, uas_data->uac_tsx->last_tx, + pjsip_endpt_create_cancel(global.endpt, uas_data2->uac_tsx->last_tx, &cancel); pjsip_endpt_send_request(global.endpt, cancel, -1, NULL, NULL); - pj_grp_lock_release(uas_data->uac_tsx->grp_lock); + pj_grp_lock_release(uas_data2->uac_tsx->grp_lock); } /* Unlock UAS tsx because it is locked in find_tsx() */ |