Changeset 1929 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Apr 14, 2008 4:04:30 AM (16 years ago)

Author:

bennylp

Message:

Fixed miscellaneous compile warnings/errors when built with C++ mode

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -212 +212 @@
         "error while using pfkey"           /* err_status_pfkey_err     = 24 */
     };
-    if (err >= 0 && err < PJ_ARRAY_SIZE(liberr)) {
+    if (err >= 0 && err < (int)PJ_ARRAY_SIZE(liberr)) {
         return liberr[err];
     } else {
@@ -264 +264 @@
 PJ_DEF(void) pjmedia_srtp_setting_default(pjmedia_srtp_setting *opt)
 {
-    int i;
+    unsigned i;
 
     pj_bzero(opt, sizeof(pjmedia_srtp_setting));
@@ -289 +289 @@
     transport_srtp *srtp;
     pj_status_t status;
-    int i;
+    unsigned i;
 
     PJ_ASSERT_RETURN(endpt && p_tp, PJ_EINVAL);
@@ -821 +821 @@
         char key[MAX_KEY_LEN];
         err_status_t err;
-        int i;
+        unsigned i;
 
         PJ_ASSERT_RETURN(MAX_KEY_LEN >= crypto_suites[cs_idx].cipher_key_len,
@@ -840 +840 @@
 
         } while (!key_ok);
-        crypto->key.ptr = pj_pool_zalloc(pool, 
+        crypto->key.ptr = (char*)
+                          pj_pool_zalloc(pool, 
                                          crypto_suites[cs_idx].cipher_key_len);
         pj_memcpy(crypto->key.ptr, key, crypto_suites[cs_idx].cipher_key_len);
@@ -923 +924 @@
     }
     tmp = pj_str(token);
-    crypto->key.ptr = pj_pool_zalloc(pool, MAX_KEY_LEN);
+    crypto->key.ptr = (char*) pj_pool_zalloc(pool, MAX_KEY_LEN);
 
     /* Decode key */
@@ -953 +954 @@
     pjmedia_sdp_attr *attr;
     pj_str_t attr_value;
-    int i, j;
+    unsigned i, j;
     unsigned member_tp_option;
 
@@ -1234 +1235 @@
 
             /* our offer tag is always ordered by setting */
-            if (rem_tag < 1 || rem_tag > srtp->setting.crypto_count) {
+            if (rem_tag < 1 || rem_tag > (int)srtp->setting.crypto_count) {
                 DEACTIVATE_MEDIA(pool, m_loc);
                 return PJMEDIA_SRTP_ESDPINCRYPTOTAG;