Changeset 4634 for pjproject/trunk

Timestamp:

Oct 23, 2013 9:29:35 AM (11 years ago)

Author:

riza

Message:

Re #1643: Fix some build warnings detected on VS2012

Location:

pjproject/trunk/pjsip-apps/src/pjsua

Files:

• pjsua_app.c (modified) (4 diffs)
• pjsua_app_cli.c (modified) (1 diff)

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

@@ -326 +326 @@
                   call_info.remote_info.ptr,
                   call_info.local_info.ptr,
-                  (app_config.use_cli?"c a":"a"),
-                  (app_config.use_cli?"c g":"h")));
+                  (app_config.use_cli?"ca a":"a"),
+                  (app_config.use_cli?"g":"h")));
     }
 }
@@ -848 +848 @@
     }
 
-    body.ptr = mwi_info->rdata->msg_info.msg->body->data;
+    body.ptr = (char *)mwi_info->rdata->msg_info.msg->body->data;
     body.slen = mwi_info->rdata->msg_info.msg->body->len;
 
@@ -1078 +1078 @@
 
     status = pjsip_endpt_create_response(pjsua_get_pjsip_endpt(),
-                                 rdata, 200, NULL, &tdata);
+                                         rdata, 200, NULL, &tdata);
     if (status != PJ_SUCCESS)
     return;
 
-    exp = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_EXPIRES, NULL);
+    exp = (pjsip_expires_hdr *)pjsip_msg_find_hdr(rdata->msg_info.msg, 
+                                                  PJSIP_H_EXPIRES, NULL);
 
     h = rdata->msg_info.msg->hdr.next;
     while (h != &rdata->msg_info.msg->hdr) {
-    if (h->type == PJSIP_H_CONTACT) {
-    const pjsip_contact_hdr *c = (const pjsip_contact_hdr*)h;
-    int e = c->expires;
-
-    if (e < 0) {
-        if (exp)
-            e = exp->ivalue;
-        else
-            e = 3600;
-    }
-
-    if (e > 0) {
-        pjsip_contact_hdr *nc = pjsip_hdr_clone(tdata->pool, h);
-        nc->expires = e;
-        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)nc);
-        ++cnt;
-    }
-    }
-    h = h->next;
+        if (h->type == PJSIP_H_CONTACT) {
+            const pjsip_contact_hdr *c = (const pjsip_contact_hdr*)h;
+            int e = c->expires;
+
+            if (e < 0) {
+                if (exp)
+                    e = exp->ivalue;
+                else
+                    e = 3600;
+            }
+
+            if (e > 0) {
+                pjsip_contact_hdr *nc = (pjsip_contact_hdr *)pjsip_hdr_clone(
+                                                                tdata->pool, h);
+                nc->expires = e;
+                pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)nc);
+                ++cnt;
+            }
+        }
+        h = h->next;
     }
 
@@ -1165 +1167 @@
                                              PJSIP_H_ALLOW, NULL);
         if (cap_hdr) {
-            pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, 
-                                                           cap_hdr));
+            pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *)pjsip_hdr_clone(
+                                                         tdata->pool, cap_hdr));
         }
     }

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

@@ -1644 +1644 @@
      */
     if (next) {
-        find_next_call(current_call);
+        find_next_call();
     } else {
-        find_prev_call(current_call);
+        find_prev_call();
     }