From facf42790301a8a51d5652b3047854ccb4411150 Mon Sep 17 00:00:00 2001
From: Riza Sulistyo <riza@teluu.com>
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
---
 pjlib-util/src/pjlib-util-test/resolver_test.c |  6 ++++--
 pjlib-util/src/pjlib-util/errno.c              |  2 +-
 pjmedia/src/test/mips_test.c                   | 11 ++++++-----
 pjnath/src/pjnath-test/concur_test.c           |  1 +
 pjnath/src/pjnath-test/stun.c                  |  1 +
 pjnath/src/pjnath/errno.c                      |  2 +-
 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 --
 pjsip/src/pjsip/sip_transport_loop.c           |  2 ++
 pjsip/src/pjsua-lib/pjsua_acc.c                |  1 +
 pjsip/src/pjsua-lib/pjsua_call.c               |  1 +
 pjsip/src/pjsua-lib/pjsua_media.c              |  2 ++
 pjsip/src/test/inv_offer_answer_test.c         |  5 ++++-
 pjsip/src/test/regc_test.c                     |  3 ++-
 pjsip/src/test/tsx_uac_test.c                  |  7 +++----
 19 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/pjlib-util/src/pjlib-util-test/resolver_test.c b/pjlib-util/src/pjlib-util-test/resolver_test.c
index 791d9d2b..b18e6a05 100644
--- a/pjlib-util/src/pjlib-util-test/resolver_test.c
+++ b/pjlib-util/src/pjlib-util-test/resolver_test.c
@@ -710,6 +710,7 @@ static int a_parser_test(void)
 
     rc = pj_dns_parse_a_response(&pkt, &rec);
     pj_assert(rc == PJLIB_UTIL_EDNSNOANSWERREC);
+    PJ_UNUSED_ARG(rc);
 
     return 0;
 }
@@ -919,6 +920,7 @@ static int addr_parser_test(void)
 
     rc = pj_dns_parse_addr_response(&pkt, &rec);
     pj_assert(rc == PJLIB_UTIL_EDNSNOANSWERREC);
+    PJ_UNUSED_ARG(rc);
 
     return 0;
 }
@@ -1468,7 +1470,7 @@ static int srv_resolver_test(void)
     pj_sem_wait(sem);
 
 
-    return 0;
+    return status;
 }
 
 
@@ -1838,7 +1840,7 @@ static int srv_resolver_many_test(void)
 
     pj_sem_wait(sem);
 
-    return 0;
+    return status;
 }
 
 
diff --git a/pjlib-util/src/pjlib-util/errno.c b/pjlib-util/src/pjlib-util/errno.c
index ee1061ed..d5bccd33 100644
--- a/pjlib-util/src/pjlib-util/errno.c
+++ b/pjlib-util/src/pjlib-util/errno.c
@@ -184,5 +184,5 @@ PJ_DEF(pj_status_t) pjlib_util_init(void)
 				  &pjlib_util_strerror);
     pj_assert(status == PJ_SUCCESS);
 
-    return PJ_SUCCESS;
+    return status;
 }
diff --git a/pjmedia/src/test/mips_test.c b/pjmedia/src/test/mips_test.c
index e372613b..319be014 100644
--- a/pjmedia/src/test/mips_test.c
+++ b/pjmedia/src/test/mips_test.c
@@ -715,7 +715,7 @@ static pj_status_t codec_put_frame(struct pjmedia_port *this_port,
 	}
     }
 
-    return PJ_SUCCESS;
+    return status;
 }
 
 static pj_status_t codec_on_destroy(struct pjmedia_port *this_port)
@@ -1029,7 +1029,7 @@ static pj_status_t wsola_plc_get_frame(struct pjmedia_port *this_port,
 	wp->prev_lost = PJ_TRUE;
     }
 
-    return PJ_SUCCESS;
+    return status;
 }
 
 static pj_status_t wsola_plc_on_destroy(struct pjmedia_port *this_port)
@@ -1202,7 +1202,7 @@ static pj_status_t wsola_discard_get_frame(struct pjmedia_port *this_port,
 	pj_assert(status==PJ_SUCCESS);
     }
 
-    return PJ_SUCCESS;
+    return status;
 }
 
 static pj_status_t wsola_discard_on_destroy(struct pjmedia_port *this_port)
@@ -2093,7 +2093,7 @@ static pj_status_t delaybuf_get_frame(struct pjmedia_port *this_port,
 	}
     }
 
-    return PJ_SUCCESS;
+    return status;
 }
 
 static pj_status_t delaybuf_put_frame(struct pjmedia_port *this_port, 
@@ -2121,7 +2121,7 @@ static pj_status_t delaybuf_put_frame(struct pjmedia_port *this_port,
 	}
     }
 
-    return PJ_SUCCESS;
+    return status;
 }
 
 static pj_status_t delaybuf_on_destroy(struct pjmedia_port *this_port)
@@ -2365,6 +2365,7 @@ static pj_timestamp run_entry(unsigned clock_rate, struct test_entry *e)
 	    pj_assert(status == PJ_SUCCESS);
 	}
     }
+    PJ_UNUSED_ARG(status);
     pj_get_timestamp(&t1);
 
     pj_sub_timestamp(&t1, &t0);
diff --git a/pjnath/src/pjnath-test/concur_test.c b/pjnath/src/pjnath-test/concur_test.c
index f04cdff9..c3013d2a 100644
--- a/pjnath/src/pjnath-test/concur_test.c
+++ b/pjnath/src/pjnath-test/concur_test.c
@@ -288,6 +288,7 @@ static int stun_destroy_test(void)
 	                          0, 0, &test_sess.worker_threads[i]);
 	pj_assert(status == PJ_SUCCESS);
     }
+    PJ_UNUSED_ARG(status);
 
     /* Test 1: Main thread calls destroy while callback is processing response */
     PJ_LOG(3,(THIS_FILE, "    Destroy in main thread while callback is running"));
diff --git a/pjnath/src/pjnath-test/stun.c b/pjnath/src/pjnath-test/stun.c
index 51afc0dd..ec8b1e95 100644
--- a/pjnath/src/pjnath-test/stun.c
+++ b/pjnath/src/pjnath-test/stun.c
@@ -318,6 +318,7 @@ static pj_stun_msg* create1(pj_pool_t *pool)
 				PJ_STUN_IS_DATAGRAM | PJ_STUN_CHECK_PACKET,
 				&msg, NULL, &res);
     pj_assert(status != PJ_SUCCESS);
+    PJ_UNUSED_ARG(status);
     pj_assert(res != NULL);
 
     return res;
diff --git a/pjnath/src/pjnath/errno.c b/pjnath/src/pjnath/errno.c
index a6bb471a..fde47eb8 100644
--- a/pjnath/src/pjnath/errno.c
+++ b/pjnath/src/pjnath/errno.c
@@ -184,7 +184,7 @@ PJ_DEF(pj_status_t) pjnath_init(void)
 				  &pjnath_strerror2);
     pj_assert(status == PJ_SUCCESS);
 
-    return PJ_SUCCESS;
+    return status;
 }
 
 
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 */
diff --git a/pjsip/src/pjsip/sip_transport_loop.c b/pjsip/src/pjsip/sip_transport_loop.c
index 04475154..5cbe26a9 100644
--- a/pjsip/src/pjsip/sip_transport_loop.c
+++ b/pjsip/src/pjsip/sip_transport_loop.c
@@ -190,6 +190,7 @@ static pj_status_t loop_send_msg( pjsip_transport *tp,
 	size_eaten = pjsip_tpmgr_receive_packet( loop->base.tpmgr, 
 						 &recv_pkt->rdata);
 	pj_assert(size_eaten == recv_pkt->rdata.pkt_info.len);
+	PJ_UNUSED_ARG(size_eaten);
 
 	pjsip_endpt_release_pool(loop->base.endpt, 
 				 recv_pkt->rdata.tp_info.pool);
@@ -336,6 +337,7 @@ static int loop_transport_worker_thread(void *arg)
 
 	    /* Must "eat" all the packets. */
 	    pj_assert(size_eaten == node->rdata.pkt_info.len);
+	    PJ_UNUSED_ARG(size_eaten);
 
 	    /* Done. */
 	    pjsip_endpt_release_pool(loop->base.endpt,
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c
index 3b7237d3..dc67d701 100644
--- a/pjsip/src/pjsua-lib/pjsua_acc.c
+++ b/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -2599,6 +2599,7 @@ PJ_DEF(pj_status_t) pjsua_acc_set_registration( pjsua_acc_id acc_id,
 	    d = pjsip_uri_print(PJSIP_URI_IN_REQ_URI, tdata->msg->line.req.uri,
 				uri, acc->cfg.reg_uri.slen+10);
 	    pj_assert(d > 0);
+	    PJ_UNUSED_ARG(d);
 
 	    h = pjsip_authorization_hdr_create(tdata->pool);
 	    h->scheme = pj_str("Digest");
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c
index 70546278..e0c2ed47 100644
--- a/pjsip/src/pjsua-lib/pjsua_call.c
+++ b/pjsip/src/pjsua-lib/pjsua_call.c
@@ -3316,6 +3316,7 @@ static pj_bool_t check_lock_codec(pjsua_call *call)
 
 	/* Verify that media must be active. */
 	pj_assert(loc_m->desc.port && rem_m->desc.port);
+	PJ_UNUSED_ARG(loc_m);
 
 	/* Count the formats in the answer. */
 	for (j=0; j<rem_m->desc.fmt_count && codec_cnt <= 1; ++j) {
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c
index 3fc61e09..0912878b 100644
--- a/pjsip/src/pjsua-lib/pjsua_media.c
+++ b/pjsip/src/pjsua-lib/pjsua_media.c
@@ -2252,6 +2252,8 @@ pj_status_t pjsua_media_channel_create_sdp(pjsua_call_id call_id,
     if (call->inv && call->inv->neg)
 	sdp_neg_state = pjmedia_sdp_neg_get_state(call->inv->neg);
 
+    PJ_UNUSED_ARG(sdp_neg_state);
+
     /* Get one address to use in the origin field */
     pj_bzero(&origin, sizeof(origin));
     for (mi=0; mi<call->med_prov_cnt; ++mi) {
diff --git a/pjsip/src/test/inv_offer_answer_test.c b/pjsip/src/test/inv_offer_answer_test.c
index 4c5eb28b..ad5fcd40 100644
--- a/pjsip/src/test/inv_offer_answer_test.c
+++ b/pjsip/src/test/inv_offer_answer_test.c
@@ -184,6 +184,7 @@ static pjmedia_sdp_session *create_sdp(pj_pool_t *pool, const char *body)
     pj_strdup2_with_null(pool, &dup, body);
     status = pjmedia_sdp_parse(pool, dup.ptr, dup.slen, &sdp);
     pj_assert(status == PJ_SUCCESS);
+    PJ_UNUSED_ARG(status);
 
     return sdp;
 }
@@ -335,7 +336,7 @@ static pj_bool_t on_rx_request(pjsip_rx_data *rdata)
 	status = pjsip_inv_send_msg(inv_test.uas, tdata);
 	pj_assert(status == PJ_SUCCESS);
 
-	return PJ_TRUE;
+	return (status == PJ_SUCCESS);
     }
 
     return PJ_FALSE;
@@ -392,6 +393,7 @@ static void run_job(job_t *j)
 	pj_assert(status == PJ_SUCCESS);
 	break;
     }
+    PJ_UNUSED_ARG(status);
 }
 
 
@@ -676,6 +678,7 @@ int inv_offer_answer_test(void)
 	pj_sockaddr_in_init(&addr, NULL, PORT);
 	status = pjsip_udp_transport_start(endpt, &addr, NULL, 1, &tp);
 	pj_assert(status == PJ_SUCCESS);
+	PJ_UNUSED_ARG(status);
     }
 
     /* Do tests */
diff --git a/pjsip/src/test/regc_test.c b/pjsip/src/test/regc_test.c
index d503a789..8b2f7931 100644
--- a/pjsip/src/test/regc_test.c
+++ b/pjsip/src/test/regc_test.c
@@ -204,7 +204,7 @@ static pj_bool_t regs_rx_request(pjsip_rx_data *rdata)
 				 &hdr_list, NULL, NULL);
     pj_assert(status == PJ_SUCCESS);
 
-    return PJ_TRUE;
+    return (status == PJ_SUCCESS);
 }
 
 
@@ -242,6 +242,7 @@ static void client_cb(struct pjsip_regc_cbparam *param)
 
     status = pjsip_regc_get_info(param->regc, &info);
     pj_assert(status == PJ_SUCCESS);
+    PJ_UNUSED_ARG(status);
 
     client->error = (param->status != PJ_SUCCESS);
     client->code = param->code;
diff --git a/pjsip/src/test/tsx_uac_test.c b/pjsip/src/test/tsx_uac_test.c
index d978df80..4bf15315 100644
--- a/pjsip/src/test/tsx_uac_test.c
+++ b/pjsip/src/test/tsx_uac_test.c
@@ -777,8 +777,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
 	timer.entry.user_data = r;
 	pjsip_endpt_schedule_timer(endpt, &timer.entry, &delay);
 
-	return PJ_TRUE;
-
+	return (status == PJ_SUCCESS);
 
     } else
     if (pj_stricmp2(&rdata->msg_info.via->branch_param, TEST8_BRANCH_ID) == 0) {
@@ -850,7 +849,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
 	 * provisional response.
 	 */
 	pjsip_method *method;
-	pj_status_t status;
+	pj_status_t status = PJ_SUCCESS;
 
 	method = &rdata->msg_info.msg->line.req.method;
 
@@ -933,7 +932,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
 
 	}
 
-	return PJ_TRUE;
+	return (status == PJ_SUCCESS);
 
     }
 
-- 
cgit v1.2.3