Changeset 5461

Timestamp:

Oct 14, 2016 4:53:07 AM (8 years ago)

Author:

ming

Message:

Re #1945 (misc): Get rid of 64-bit compiler warnings for pjsua_app

Location:

pjproject/trunk/pjsip-apps/src/pjsua

Files:

• pjsua_app_cli.c (modified) (7 diffs)
• pjsua_app_common.c (modified) (1 diff)
• pjsua_app_config.c (modified) (9 diffs)
• pjsua_app_legacy.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_cli.c

@@ -1089 +1089 @@
     };
 
-    choice = pj_strtol(&cval->argv[1]) - 1;
+    choice = (int)pj_strtol(&cval->argv[1]) - 1;
 
     pj_bzero(&elem, sizeof(elem));
@@ -1248 +1248 @@
 
     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) {
@@ -1306 +1306 @@
     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;
@@ -1517 +1517 @@
                      pjsua_call_get_count());
 
-    count = pj_strtol(&cval->argv[1]);
+    count = (int)pj_strtol(&cval->argv[1]);
     if (count < 1)
         return PJ_SUCCESS;
@@ -1577 +1577 @@
         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;
@@ -1850 +1850 @@
             ACCEPT_REPLACE, ACCEPT, REJECT, STOP
         };
-        int choice = pj_strtol(&cval->argv[1]);
+        int choice = (int)pj_strtol(&cval->argv[1]);
 
         switch (choice) {
@@ -2550 +2550 @@
     int delay;
 
-    delay = pj_strtoul(&cval->argv[1]);
+    delay = (int)pj_strtoul(&cval->argv[1]);
     if (delay < 0) delay = 0;
     pj_thread_sleep(delay);

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_common.c

@@ -53 +53 @@
     } 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);
     }
 }

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_config.c

@@ -560 +560 @@
 
         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,
@@ -572 +572 @@
 
         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,
@@ -627 +627 @@
                 return PJ_EINVAL;
             }
-            cfg->media_cfg.clock_rate = lval;
+            cfg->media_cfg.clock_rate = (unsigned)lval;
             break;
 
@@ -637 +637 @@
                 return PJ_EINVAL;
             }
-            cfg->media_cfg.snd_clock_rate = lval;
+            cfg->media_cfg.snd_clock_rate = (unsigned)lval;
             break;
 
@@ -718 +718 @@
 
         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,
@@ -747 +747 @@
                 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,
@@ -763 +763 @@
 
         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,
@@ -810 +810 @@
 
         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;
 
@@ -871 +871 @@
 
         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;
 

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.c

@@ -1379 +1379 @@
         }
 
-        delay = pj_strtoul(&tmp);
+        delay = (int)pj_strtoul(&tmp);
         if (delay < 0) delay = 0;
         pj_thread_sleep(delay);