diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2012-03-30 07:41:56 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2012-03-30 07:41:56 +0000 |
commit | 6ef0bba7baead4609bcf8ce2ea48d9f7ad0c0dc1 (patch) | |
tree | f3bf043aa9096f72c42cfdbab9cd6ebb448827e5 | |
parent | 6b4964727bffb379aca9601e1cf69051ccbf600c (diff) |
Misc (re #1446): Fixed compile warnings on VS2005.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4000 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjsip-apps/src/samples/sipecho.c | 15 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_aud.c | 6 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_vid.c | 6 |
3 files changed, 18 insertions, 9 deletions
diff --git a/pjsip-apps/src/samples/sipecho.c b/pjsip-apps/src/samples/sipecho.c index 012e6718..2b2830ea 100644 --- a/pjsip-apps/src/samples/sipecho.c +++ b/pjsip-apps/src/samples/sipecho.c @@ -418,11 +418,10 @@ static pj_bool_t on_rx_request( pjsip_rx_data *rdata ) pj_str_t local_uri; pjsip_dialog *dlg; pjsip_rdata_sdp_info *sdp_info; - pjmedia_sdp_session *answer; - pjsip_tx_data *tdata; - call_t *call; + pjmedia_sdp_session *answer = NULL; + pjsip_tx_data *tdata = NULL; + call_t *call = NULL; unsigned i; - unsigned options = 0; pj_status_t status; PJ_LOG(3,(THIS_FILE, "RX %.*s from %s", @@ -489,7 +488,8 @@ static pj_bool_t on_rx_request( pjsip_rx_data *rdata ) } /* Generate Contact URI */ - if (pj_gethostip(AF, &hostaddr) != PJ_SUCCESS) { + status = pj_gethostip(AF, &hostaddr); + if (status != PJ_SUCCESS) { app_perror(THIS_FILE, "Unable to retrieve local host IP", status); return PJ_TRUE; } @@ -560,7 +560,6 @@ int main(int argc, char *argv[]) pj_str_t dst_uri = pj_str(argv[1]); pj_str_t local_uri; pjsip_dialog *dlg; - pjmedia_sdp_session *local_sdp; pj_status_t status; pjsip_tx_data *tdata; @@ -612,7 +611,9 @@ int main(int argc, char *argv[]) " q Quit\n", (app.enable_msg_logging? "Disable" : "Enable")); - fgets(s, sizeof(s), stdin) != NULL; + if (fgets(s, sizeof(s), stdin) == NULL) + continue; + if (s[0]=='q') break; switch (s[0]) { diff --git a/pjsip/src/pjsua-lib/pjsua_aud.c b/pjsip/src/pjsua-lib/pjsua_aud.c index cbe52daf..b3dd308e 100644 --- a/pjsip/src/pjsua-lib/pjsua_aud.c +++ b/pjsip/src/pjsua-lib/pjsua_aud.c @@ -569,7 +569,11 @@ pj_status_t pjsua_aud_channel_update(pjsua_call_media *call_med, pjsua_call *call = call_med->call; pjmedia_port *media_port; unsigned strm_idx = call_med->idx; - pj_status_t status; + pj_status_t status = PJ_SUCCESS; + + PJ_UNUSED_ARG(tmp_pool); + PJ_UNUSED_ARG(local_sdp); + PJ_UNUSED_ARG(remote_sdp); PJ_LOG(4,(THIS_FILE,"Audio channel update..")); pj_log_push_indent(); diff --git a/pjsip/src/pjsua-lib/pjsua_vid.c b/pjsip/src/pjsua-lib/pjsua_vid.c index ec8a72e0..8ffb883f 100644 --- a/pjsip/src/pjsua-lib/pjsua_vid.c +++ b/pjsip/src/pjsua-lib/pjsua_vid.c @@ -701,7 +701,11 @@ pj_status_t pjsua_vid_channel_update(pjsua_call_media *call_med, pjsua_acc *acc = &pjsua_var.acc[call->acc_id]; pjmedia_port *media_port; pj_status_t status; - + + PJ_UNUSED_ARG(tmp_pool); + PJ_UNUSED_ARG(local_sdp); + PJ_UNUSED_ARG(remote_sdp); + PJ_LOG(4,(THIS_FILE, "Video channel update..")); pj_log_push_indent(); |