From facf42790301a8a51d5652b3047854ccb4411150 Mon Sep 17 00:00:00 2001 From: Riza Sulistyo Date: Thu, 19 Jan 2017 10:31:38 +0000 Subject: Close #1919: Clear unused-variable warnings. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5535 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/src/pjsua/pjsua_app_cli.c | 4 ---- pjsip-apps/src/samples/aectest.c | 1 + pjsip-apps/src/samples/auddemo.c | 2 ++ pjsip-apps/src/samples/aviplay.c | 19 +++++++++++++------ pjsip-apps/src/samples/pjsip-perf.c | 1 + pjsip-apps/src/samples/siprtp.c | 2 -- 6 files changed, 17 insertions(+), 12 deletions(-) (limited to 'pjsip-apps/src') diff --git a/pjsip-apps/src/pjsua/pjsua_app_cli.c b/pjsip-apps/src/pjsua/pjsua_app_cli.c index a0f8931a..b6b6116e 100644 --- a/pjsip-apps/src/pjsua/pjsua_app_cli.c +++ b/pjsip-apps/src/pjsua/pjsua_app_cli.c @@ -207,10 +207,6 @@ pj_status_t cli_init() /* Init telnet frontend */ if (app_config.cli_cfg.cli_fe & CLI_FE_TELNET) { pj_cli_telnet_cfg *fe_cfg = &app_config.cli_cfg.telnet_cfg; - pj_pool_t *pool; - - pool = pj_pool_create(cfg->pf, "cli_cp", 128, 128, NULL); - pj_assert(pool); status = pj_cli_telnet_create(cli, fe_cfg, &telnet_front_end); if (status != PJ_SUCCESS) diff --git a/pjsip-apps/src/samples/aectest.c b/pjsip-apps/src/samples/aectest.c index ab887da2..a86ab9f4 100644 --- a/pjsip-apps/src/samples/aectest.c +++ b/pjsip-apps/src/samples/aectest.c @@ -300,6 +300,7 @@ int main(int argc, char *argv[]) char s[10], *dummy; puts("ENTER to quit"); dummy = fgets(s, sizeof(s), stdin); + PJ_UNUSED_ARG(dummy); } /* Done. */ diff --git a/pjsip-apps/src/samples/auddemo.c b/pjsip-apps/src/samples/auddemo.c index 48bcad4e..c91ac9cb 100644 --- a/pjsip-apps/src/samples/auddemo.c +++ b/pjsip-apps/src/samples/auddemo.c @@ -296,6 +296,7 @@ static void record(unsigned rec_index, const char *filename) PJ_LOG(3,(THIS_FILE, "Recording started, press ENTER to stop")); dummy = fgets(line, sizeof(line), stdin); + PJ_UNUSED_ARG(dummy); on_return: if (strm) { @@ -363,6 +364,7 @@ static void play_file(unsigned play_index, const char *filename) PJ_LOG(3,(THIS_FILE, "Playback started, press ENTER to stop")); dummy = fgets(line, sizeof(line), stdin); + PJ_UNUSED_ARG(dummy); on_return: if (strm) { diff --git a/pjsip-apps/src/samples/aviplay.c b/pjsip-apps/src/samples/aviplay.c index 40dfaf90..ea75f367 100644 --- a/pjsip-apps/src/samples/aviplay.c +++ b/pjsip-apps/src/samples/aviplay.c @@ -467,13 +467,13 @@ static int main_func(int argc, char *argv[]) if (argc != 2) { puts("Error: filename required"); puts(desc); - return 1; + return 110; } /* Must init PJLIB first: */ status = pj_init(); - PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1); + PJ_ASSERT_RETURN(status == PJ_SUCCESS, 120); /* Must create a pool factory before we can allocate any memory. */ pj_caching_pool_init(&cp, &pj_pool_factory_default_policy, 0); @@ -492,24 +492,31 @@ static int main_func(int argc, char *argv[]) pjmedia_vid_codec_mgr_create(pool, NULL); status = pjmedia_vid_dev_subsys_init(&cp.factory); - if (status != PJ_SUCCESS) + if (status != PJ_SUCCESS) { + rc = 130; goto on_return; + } status = pjmedia_aud_subsys_init(&cp.factory); if (status != PJ_SUCCESS) { + rc = 140; goto on_return; } #if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0 status = pjmedia_codec_openh264_vid_init(NULL, &cp.factory); - if (status != PJ_SUCCESS) + if (status != PJ_SUCCESS) { + rc = 150; goto on_return; + } #endif #if PJMEDIA_HAS_FFMPEG_VID_CODEC status = pjmedia_codec_ffmpeg_vid_init(NULL, &cp.factory); - if (status != PJ_SUCCESS) + if (status != PJ_SUCCESS) { + rc = 160; goto on_return; + } #endif rc = aviplay(pool, argv[1]); @@ -548,7 +555,7 @@ on_return: pj_shutdown(); /* Done. */ - return 0; + return rc; } int main(int argc, char *argv[]) diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c index bc963330..ee3603ad 100644 --- a/pjsip-apps/src/samples/pjsip-perf.c +++ b/pjsip-apps/src/samples/pjsip-perf.c @@ -1475,6 +1475,7 @@ static int client_thread(void *arg) } else { status = submit_job(); } + PJ_UNUSED_ARG(status); ++app.client.job_submitted; ++cycle; diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index 0947cd92..3cafc42e 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -1397,14 +1397,12 @@ static void call_on_media_update( pjsip_inv_session *inv, pj_status_t status) { struct call *call; - pj_pool_t *pool; struct media_stream *audio; const pjmedia_sdp_session *local_sdp, *remote_sdp; struct codec *codec_desc = NULL; unsigned i; call = inv->mod_data[mod_siprtp.id]; - pool = inv->dlg->pool; audio = &call->media[0]; /* If this is a mid-call media update, then destroy existing media */ -- cgit v1.2.3