From 7e7c3da97d1582114cb35fc49712334ba11b2954 Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Fri, 14 Oct 2016 04:53:07 +0000 Subject: Re #1945 (misc): Get rid of 64-bit compiler warnings for pjsua_app git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5461 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/src/pjsua/pjsua_app_cli.c | 20 ++++++++++---------- pjsip-apps/src/pjsua/pjsua_app_common.c | 4 ++-- pjsip-apps/src/pjsua/pjsua_app_config.c | 22 +++++++++++----------- pjsip-apps/src/pjsua/pjsua_app_legacy.c | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'pjsip-apps') diff --git a/pjsip-apps/src/pjsua/pjsua_app_cli.c b/pjsip-apps/src/pjsua/pjsua_app_cli.c index 4d6b1d41..a0f8931a 100644 --- a/pjsip-apps/src/pjsua/pjsua_app_cli.c +++ b/pjsip-apps/src/pjsua/pjsua_app_cli.c @@ -1088,7 +1088,7 @@ static pj_status_t cmd_set_presence_text(pj_cli_cmd_val *cval) AVAILABLE, BUSY, OTP, IDLE, AWAY, BRB, OFFLINE, OPT_MAX }; - choice = pj_strtol(&cval->argv[1]) - 1; + choice = (int)pj_strtol(&cval->argv[1]) - 1; pj_bzero(&elem, sizeof(elem)); elem.type = PJRPID_ELEMENT_TYPE_PERSON; @@ -1247,11 +1247,11 @@ static pj_status_t cmd_media_connect(pj_cli_cmd_val *cval, pj_bool_t connect) pj_status_t status; if (connect) - status = pjsua_conf_connect(pj_strtol(&cval->argv[1]), - pj_strtol(&cval->argv[2])); + status = pjsua_conf_connect((int)pj_strtol(&cval->argv[1]), + (int)pj_strtol(&cval->argv[2])); else - status = pjsua_conf_disconnect(pj_strtol(&cval->argv[1]), - pj_strtol(&cval->argv[2])); + status = pjsua_conf_disconnect((int)pj_strtol(&cval->argv[1]), + (int)pj_strtol(&cval->argv[2])); if (status == PJ_SUCCESS) { static const pj_str_t success_msg = {"Success\n", 9}; @@ -1305,7 +1305,7 @@ static pj_status_t cmd_set_codec_prio(pj_cli_cmd_val *cval) int new_prio; pj_status_t status; - new_prio = pj_strtol(&cval->argv[2]); + new_prio = (int)pj_strtol(&cval->argv[2]); if (new_prio < 0) new_prio = 0; else if (new_prio > PJMEDIA_CODEC_PRIO_HIGHEST) @@ -1516,7 +1516,7 @@ static pj_status_t cmd_make_multi_call(pj_cli_cmd_val *cval) "(You currently have %d calls)\n", pjsua_call_get_count()); - count = pj_strtol(&cval->argv[1]); + count = (int)pj_strtol(&cval->argv[1]); if (count < 1) return PJ_SUCCESS; @@ -1576,7 +1576,7 @@ static pj_status_t cmd_answer_call(pj_cli_cmd_val *cval) pj_str_t hvalue; pjsip_generic_string_hdr hcontact; - st_code = pj_strtol(&cval->argv[1]); + st_code = (int)pj_strtol(&cval->argv[1]); if ((st_code < 100) || (st_code > 699)) return PJ_SUCCESS; @@ -1849,7 +1849,7 @@ static pj_status_t cmd_redirect_call(pj_cli_cmd_val *cval) enum { ACCEPT_REPLACE, ACCEPT, REJECT, STOP }; - int choice = pj_strtol(&cval->argv[1]); + int choice = (int)pj_strtol(&cval->argv[1]); switch (choice) { case ACCEPT_REPLACE: @@ -2549,7 +2549,7 @@ static pj_status_t cmd_sleep_handler(pj_cli_cmd_val *cval) { int delay; - delay = pj_strtoul(&cval->argv[1]); + delay = (int)pj_strtoul(&cval->argv[1]); if (delay < 0) delay = 0; pj_thread_sleep(delay); diff --git a/pjsip-apps/src/pjsua/pjsua_app_common.c b/pjsip-apps/src/pjsua/pjsua_app_common.c index 0d57da14..13553d4b 100644 --- a/pjsip-apps/src/pjsua/pjsua_app_common.c +++ b/pjsip-apps/src/pjsua/pjsua_app_common.c @@ -52,9 +52,9 @@ int my_atoi(const char *cs) return 0 - (int)pj_strtoul(&s); } else if (cs[0] == '+') { s.ptr++, s.slen--; - return pj_strtoul(&s); + return (int)pj_strtoul(&s); } else { - return pj_strtoul(&s); + return (int)pj_strtoul(&s); } } diff --git a/pjsip-apps/src/pjsua/pjsua_app_config.c b/pjsip-apps/src/pjsua/pjsua_app_config.c index 00ba2784..6649700a 100644 --- a/pjsip-apps/src/pjsua/pjsua_app_config.c +++ b/pjsip-apps/src/pjsua/pjsua_app_config.c @@ -559,7 +559,7 @@ static pj_status_t parse_args(int argc, char *argv[], break; case OPT_LOG_LEVEL: - c = pj_strtoul(pj_cstr(&tmp, pj_optarg)); + c = (int)pj_strtoul(pj_cstr(&tmp, pj_optarg)); if (c < 0 || c > 6) { PJ_LOG(1,(THIS_FILE, "Error: expecting integer value 0-6 " @@ -571,7 +571,7 @@ static pj_status_t parse_args(int argc, char *argv[], break; case OPT_APP_LOG_LEVEL: - cfg->log_cfg.console_level = pj_strtoul(pj_cstr(&tmp, pj_optarg)); + cfg->log_cfg.console_level = (unsigned)pj_strtoul(pj_cstr(&tmp, pj_optarg)); if (cfg->log_cfg.console_level > 6) { PJ_LOG(1,(THIS_FILE, "Error: expecting integer value 0-6 " @@ -626,7 +626,7 @@ static pj_status_t parse_args(int argc, char *argv[], "8000-192000 for conference clock rate")); return PJ_EINVAL; } - cfg->media_cfg.clock_rate = lval; + cfg->media_cfg.clock_rate = (unsigned)lval; break; case OPT_SND_CLOCK_RATE: @@ -636,7 +636,7 @@ static pj_status_t parse_args(int argc, char *argv[], "8000-192000 for sound device clock rate")); return PJ_EINVAL; } - cfg->media_cfg.snd_clock_rate = lval; + cfg->media_cfg.snd_clock_rate = (unsigned)lval; break; case OPT_STEREO: @@ -717,7 +717,7 @@ static pj_status_t parse_args(int argc, char *argv[], break; case OPT_REG_TIMEOUT: /* reg-timeout */ - cur_acc->reg_timeout = pj_strtoul(pj_cstr(&tmp,pj_optarg)); + cur_acc->reg_timeout = (unsigned)pj_strtoul(pj_cstr(&tmp,pj_optarg)); if (cur_acc->reg_timeout < 1 || cur_acc->reg_timeout > 3600) { PJ_LOG(1,(THIS_FILE, "Error: invalid value for --reg-timeout " @@ -746,12 +746,12 @@ static pj_status_t parse_args(int argc, char *argv[], "Error: expecting integer value 0-3 for --use-timer")); return PJ_EINVAL; } - cur_acc->use_timer = lval; - cfg->cfg.use_timer = lval; + cur_acc->use_timer = (pjsua_sip_timer_use)lval; + cfg->cfg.use_timer = (pjsua_sip_timer_use)lval; break; case OPT_TIMER_SE: /** session timer session expiration */ - cur_acc->timer_setting.sess_expires = pj_strtoul(pj_cstr(&tmp, pj_optarg)); + cur_acc->timer_setting.sess_expires = (unsigned)pj_strtoul(pj_cstr(&tmp, pj_optarg)); if (cur_acc->timer_setting.sess_expires < 90) { PJ_LOG(1,(THIS_FILE, "Error: invalid value for --timer-se " @@ -762,7 +762,7 @@ static pj_status_t parse_args(int argc, char *argv[], break; case OPT_TIMER_MIN_SE: /** session timer minimum session expiration */ - cur_acc->timer_setting.min_se = pj_strtoul(pj_cstr(&tmp, pj_optarg)); + cur_acc->timer_setting.min_se = (unsigned)pj_strtoul(pj_cstr(&tmp, pj_optarg)); if (cur_acc->timer_setting.min_se < 90) { PJ_LOG(1,(THIS_FILE, "Error: invalid value for --timer-min-se " @@ -809,7 +809,7 @@ static pj_status_t parse_args(int argc, char *argv[], break; case OPT_AUTO_UPDATE_NAT: /* OPT_AUTO_UPDATE_NAT */ - cur_acc->allow_contact_rewrite = pj_strtoul(pj_cstr(&tmp, pj_optarg)); + cur_acc->allow_contact_rewrite = (pj_bool_t)pj_strtoul(pj_cstr(&tmp, pj_optarg)); break; case OPT_DISABLE_STUN: @@ -870,7 +870,7 @@ static pj_status_t parse_args(int argc, char *argv[], break; case OPT_REG_RETRY_INTERVAL: - cur_acc->reg_retry_interval = pj_strtoul(pj_cstr(&tmp, pj_optarg)); + cur_acc->reg_retry_interval = (unsigned)pj_strtoul(pj_cstr(&tmp, pj_optarg)); break; case OPT_REG_USE_PROXY: diff --git a/pjsip-apps/src/pjsua/pjsua_app_legacy.c b/pjsip-apps/src/pjsua/pjsua_app_legacy.c index 64a44f05..ceb77e37 100644 --- a/pjsip-apps/src/pjsua/pjsua_app_legacy.c +++ b/pjsip-apps/src/pjsua/pjsua_app_legacy.c @@ -1378,7 +1378,7 @@ static void ui_sleep(char menuin[]) return; } - delay = pj_strtoul(&tmp); + delay = (int)pj_strtoul(&tmp); if (delay < 0) delay = 0; pj_thread_sleep(delay); } -- cgit v1.2.3