Changeset 5860 for pjproject

Timestamp:

Aug 16, 2018 2:39:36 AM (6 years ago)

Author:

nanang

Message:

Re #2096: Fixed some compile warnings.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• transport_srtp.c (modified) (2 diffs)
• transport_srtp_dtls.c (modified) (1 diff)
• transport_srtp_sdes.c (modified) (1 diff)

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

@@ -1056 +1056 @@
         PJ_LOG(4, (srtp->pool->obj_name,
                    "SRTP started, keying=%s, crypto=%s",
-                   (srtp->keying[0]->type==PJMEDIA_SRTP_KEYING_SDES?
+                   ((int)srtp->keying[0]->type==PJMEDIA_SRTP_KEYING_SDES?
                     "SDES":"DTLS-SRTP"),
                    srtp->tx_policy.name.ptr));
@@ -1652 +1652 @@
         pj_assert(srtp->keying_cnt == 1);
         PJ_LOG(4, (srtp->pool->obj_name, "SRTP uses keying method %s",
-                   (srtp->keying[0]->type==PJMEDIA_SRTP_KEYING_SDES?
+                   ((int)srtp->keying[0]->type==PJMEDIA_SRTP_KEYING_SDES?
                     "SDES":"DTLS-SRTP")));
     }

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

@@ -190 +190 @@
 
     pj_ansi_strncpy(ds->base.name, pool->obj_name, PJ_MAX_OBJ_NAME);
-    ds->base.type = PJMEDIA_SRTP_KEYING_DTLS_SRTP;
+    ds->base.type = (pjmedia_transport_type)PJMEDIA_SRTP_KEYING_DTLS_SRTP;
     ds->base.op = &dtls_op;
     ds->base.user_data = srtp;

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_sdes.c

@@ -79 +79 @@
     pj_ansi_strncpy(sdes->name, srtp->pool->obj_name, PJ_MAX_OBJ_NAME);
     pj_memcpy(sdes->name, "sdes", 4);
-    sdes->type = PJMEDIA_SRTP_KEYING_SDES;
+    sdes->type = (pjmedia_transport_type)PJMEDIA_SRTP_KEYING_SDES;
     sdes->op = &sdes_op;
     sdes->user_data = srtp;