Changeset 1266 for pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

Timestamp:

May 11, 2007 3:14:34 PM (17 years ago)

Author:

bennylp

Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:

• pjproject/trunk/pjmedia/src/pjmedia/endpoint.c (modified) (11 diffs)

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -127 +127 @@
         return PJ_ENOMEM;
 
-    endpt = pj_pool_zalloc(pool, sizeof(struct pjmedia_endpt));
+    endpt = PJ_POOL_ZALLOC_T(pool, struct pjmedia_endpt);
     endpt->pool = pool;
     endpt->pf = pf;
@@ -247 +247 @@
 static int PJ_THREAD_FUNC worker_proc(void *arg)
 {
-    pjmedia_endpt *endpt = arg;
+    pjmedia_endpt *endpt = (pjmedia_endpt*) arg;
 
     while (!endpt->quit_flag) {
@@ -294 +294 @@
 
     /* Create and initialize basic SDP session */
-    sdp = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_session));
+    sdp = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session);
 
     pj_gettimeofday(&tv);
@@ -308 +308 @@
      * SDP connection line in the session level.
      */
-    sdp->conn = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_conn));
+    sdp->conn = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_conn);
     sdp->conn->net_type = STR_IN;
     sdp->conn->addr_type = STR_IP4;
@@ -322 +322 @@
 
     sdp->media_count = 1;
-    m = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_media));
+    m = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media);
     sdp->media[0] = m;
 
@@ -338 +338 @@
 #if defined(PJMEDIA_HAS_RTCP_IN_SDP) && PJMEDIA_HAS_RTCP_IN_SDP!=0
     if (sock_info->rtcp_addr_name.sin_family != 0) {
-        attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+        attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr);
         attr->name = pj_str("rtcp");
-        attr->value.ptr = pj_pool_alloc(pool, 80);
+        attr->value.ptr = (char*) pj_pool_alloc(pool, 80);
         attr->value.slen = 
             pj_ansi_snprintf(attr->value.ptr, 80,
@@ -368 +368 @@
         fmt = &m->desc.fmt[m->desc.fmt_count++];
 
-        fmt->ptr = pj_pool_alloc(pool, 8);
+        fmt->ptr = (char*) pj_pool_alloc(pool, 8);
         fmt->slen = pj_utoa(codec_info->pt, fmt->ptr);
 
@@ -400 +400 @@
         if (codec_param.setting.dec_fmtp_mode != 0) {
             const pj_str_t fmtp = { "fmtp", 4 };
-            attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr));
+            attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
 
             attr->name = fmtp;
-            attr->value.ptr = pj_pool_alloc(pool, 32);
+            attr->value.ptr = (char*) pj_pool_alloc(pool, 32);
             attr->value.slen = 
                 pj_ansi_snprintf( attr->value.ptr, 32,
@@ -414 +414 @@
 
     /* Add sendrecv attribute. */
-    attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
     attr->name = STR_SENDRECV;
     m->attr[m->attr_count++] = attr;
@@ -428 +428 @@
 
     /* Add rtpmap. */
-    attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
     attr->name = pj_str("rtpmap");
     attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR 
@@ -435 +435 @@
 
     /* Add fmtp */
-    attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
     attr->name = pj_str("fmtp");
     attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR " 0-15");