Changeset 1569

Timestamp:

Nov 10, 2007 12:05:59 PM (17 years ago)

Author:

bennylp

Message:

Fixed compilation warnings/errors under C++ mode

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util-test/encryption.c (modified) (2 diffs)
• pjsip/src/pjsip-ua/sip_reg.c (modified) (1 diff)
• pjsip/src/pjsip/sip_auth_client.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (1 diff)

pjproject/trunk/pjlib-util/src/pjlib-util-test/encryption.c

@@ -537 +537 @@
             return -90;
 
-        if (out_len != strlen(base64_test_vec[i].base64))
+        if (out_len != (int)strlen(base64_test_vec[i].base64))
             return -91;
 
@@ -552 +552 @@
             return -95;
 
-        if (out_len != strlen(base64_test_vec[i].base256))
+        if (out_len != (int)strlen(base64_test_vec[i].base256))
             return -96;
 

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -740 +740 @@
                      */
 
-                    uri1 = pjsip_uri_get_uri(contact[i]->uri);
-                    uri2 = pjsip_uri_get_uri(our_contact->uri);
+                    uri1=(const pjsip_uri*)pjsip_uri_get_uri(contact[i]->uri);
+                    uri2=(const pjsip_uri*)pjsip_uri_get_uri(our_contact->uri);
                     if (pjsip_uri_cmp(PJSIP_URI_IN_CONTACT_HDR, uri1, uri2)==0)
                     {

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -857 +857 @@
         int len;
 
-        uri_str = pj_pool_alloc(tdata->pool, PJSIP_MAX_URL_SIZE);
+        uri_str = (char*)pj_pool_alloc(tdata->pool, PJSIP_MAX_URL_SIZE);
         len = pjsip_uri_print(PJSIP_URI_IN_REQ_URI, tdata->msg->line.req.uri,
                               uri_str, PJSIP_MAX_URL_SIZE);
@@ -878 +878 @@
                 char *hdr;
 
-                hdr = pj_pool_alloc(tdata->pool, HDRLEN);
+                hdr = (char*)pj_pool_alloc(tdata->pool, HDRLEN);
                 len = pj_ansi_snprintf(
                     hdr, HDRLEN,

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -622 +622 @@
     for (i=0; i<uri_cnt; ++i) {
         hr = pjsip_route_hdr_create(pjsua_var.pool);
-        hr->name_addr.uri = pjsip_uri_clone(pjsua_var.pool, uri[i]);
+        hr->name_addr.uri = (pjsip_uri*)pjsip_uri_clone(pjsua_var.pool, uri[i]);
         pj_list_push_back(&acc->route_set, hr);
     }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

@@ -35 +35 @@
     unsigned i;
 
-    uri = pjsip_uri_get_uri((pjsip_uri*)uri);
+    uri = (const pjsip_uri*) pjsip_uri_get_uri((pjsip_uri*)uri);
 
     if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri))