Changeset 4239

Timestamp:

Aug 31, 2012 6:29:13 AM (12 years ago)

Author:

nanang

Message:

Misc (re #1562): fixed compile warnings on Win platform (some are reported as compile error on Symbian).

Location:

pjproject/trunk

Files:

• pjsip/src/pjsip/sip_transport.c (modified) (8 diffs)
• third_party/BaseClasses/wxutil.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -1180 +1180 @@
 {
     char tmp_buf[PJ_INET6_ADDRSTRLEN+10];
-    pj_str_t tmp_str = { tmp_buf, 0 };
+    pj_str_t tmp_str;
     pj_status_t status = PJSIP_EUNSUPTRANSPORT;
     unsigned flag;
@@ -1187 +1187 @@
     PJ_ASSERT_RETURN(tpmgr && pool && prm, PJ_EINVAL);
 
+    pj_strset(&tmp_str, tmp_buf, 0);
     prm->ret_addr.slen = 0;
     prm->ret_port = 0;
@@ -1198 +1199 @@
         const pjsip_transport *tp = prm->tp_sel->u.transport;
         if (prm->local_if) {
-            status = get_net_interface(tp->key.type, &prm->dst_host,
-                                       &tmp_str);
+            status = get_net_interface((pjsip_transport_type_e)tp->key.type,
+                                       &prm->dst_host, &tmp_str);
             if (status != PJ_SUCCESS)
                 goto on_return;
@@ -1207 +1208 @@
         } else {
             pj_strdup(pool, &prm->ret_addr, &tp->local_name.host);
-            prm->ret_port = tp->local_name.port;
+            prm->ret_port = (pj_uint16_t)tp->local_name.port;
         }
         status = PJ_SUCCESS;
@@ -1224 +1225 @@
                       &prm->tp_sel->u.listener->addr_name.host);
         }
-        prm->ret_port = prm->tp_sel->u.listener->addr_name.port;
+        prm->ret_port = (pj_uint16_t)prm->tp_sel->u.listener->addr_name.port;
         status = PJ_SUCCESS;
 
@@ -1246 +1247 @@
         if (status == PJ_SUCCESS) {
             if (prm->local_if) {
-                status = get_net_interface(tp->key.type, &prm->dst_host,
-                                           &tmp_str);
+                status = get_net_interface((pjsip_transport_type_e)
+                                           tp->key.type,
+                                           &prm->dst_host, &tmp_str);
                 if (status != PJ_SUCCESS)
                     goto on_return;
@@ -1255 +1257 @@
             } else {
                 pj_strdup(pool, &prm->ret_addr, &tp->local_name.host);
-                prm->ret_port = tp->local_name.port;
+                prm->ret_port = (pj_uint16_t)tp->local_name.port;
             }
 
@@ -1284 +1286 @@
                 pj_strdup(pool, &prm->ret_addr, &f->addr_name.host);
             }
-            prm->ret_port = f->addr_name.port;
+            prm->ret_port = (pj_uint16_t)f->addr_name.port;
             status = PJ_SUCCESS;
         }

pjproject/trunk/third_party/BaseClasses/wxutil.cpp

@@ -59 +59 @@
     // to be processed while we wait
     DWORD dwWait;
-    DWORD dwStartTime;
+    DWORD dwStartTime = 0;
 
     // set the waiting period.
@@ -604 +604 @@
     BOOL bPeeked = FALSE;
     DWORD dwResult;
-    DWORD dwStart;
-    DWORD dwThreadPriority;
+    DWORD dwStart = 0;
+    DWORD dwThreadPriority = THREAD_PRIORITY_HIGHEST;
 
     static UINT uMsgId = 0;