Changeset 1240 for pjproject/trunk/pjmedia/src/pjmedia/sdp.c

Timestamp:

May 1, 2007 4:54:54 PM (17 years ago)

Author:

bennylp

Message:

PJSDP port to Symbian

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp.c (modified) (16 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -104 +104 @@
     PJ_ASSERT_RETURN(pool && name, NULL);
 
-    attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr);
     pj_strdup2(pool, &attr->name, name);
 
@@ -124 +124 @@
     PJ_ASSERT_RETURN(pool && rhs, NULL);
 
-    attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr);
 
     pj_strdup(pool, &attr->name, &rhs->name);
@@ -308 +308 @@
         status = PJ_SUCCESS;
     }
-    PJ_CATCH(SYNTAX_ERROR) {
+    PJ_CATCH_ANY {
         status = PJMEDIA_SDP_EINRTPMAP;
     }
@@ -403 +403 @@
 
     }
-    PJ_CATCH(SYNTAX_ERROR) {
+    PJ_CATCH_ANY {
         status = PJMEDIA_SDP_EINRTCP;
     }
@@ -420 +420 @@
     PJ_ASSERT_RETURN(pool && attr && p_rtpmap, PJ_EINVAL);
 
-    *p_rtpmap = pj_pool_alloc(pool, sizeof(pjmedia_sdp_rtpmap));
+    *p_rtpmap = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_rtpmap);
     PJ_ASSERT_RETURN(*p_rtpmap, PJ_ENOMEM);
 
@@ -443 +443 @@
 
 
-    attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr);
     PJ_ASSERT_RETURN(attr != NULL, PJ_ENOMEM);
 
@@ -465 +465 @@
 
     attr->value.slen = len;
-    attr->value.ptr = pj_pool_alloc(pool, attr->value.slen);
+    attr->value.ptr = (char*) pj_pool_alloc(pool, attr->value.slen);
     pj_memcpy(attr->value.ptr, tempbuf, attr->value.slen);
 
@@ -494 +494 @@
                                                   const pjmedia_sdp_conn *rhs)
 {
-    pjmedia_sdp_conn *c = pj_pool_alloc (pool, sizeof(pjmedia_sdp_conn));
+    pjmedia_sdp_conn *c = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_conn);
     if (!c) return NULL;
 
@@ -589 +589 @@
 {
     unsigned int i;
-    pjmedia_sdp_media *m = pj_pool_alloc (pool, sizeof(pjmedia_sdp_media));
+    pjmedia_sdp_media *m = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_media);
     PJ_ASSERT_RETURN(m != NULL, NULL);
 
@@ -968 +968 @@
     ctx->last_error = PJMEDIA_SDP_EINATTR;
 
-    attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr);
 
     /* check equal sign */
@@ -1016 +1016 @@
     pjmedia_sdp_session *session;
     pjmedia_sdp_media *media = NULL;
-    void *attr;
+    pjmedia_sdp_attr *attr;
     pjmedia_sdp_conn *conn;
     pj_str_t dummy;
@@ -1028 +1028 @@
 
     pj_scan_init(&scanner, buf, len, 0, &on_scanner_error);
-    session = pj_pool_calloc(pool, 1, sizeof(pjmedia_sdp_session));
+    session = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session);
     PJ_ASSERT_RETURN(session != NULL, PJ_ENOMEM);
 
@@ -1052 +1052 @@
                     break;
                 case 'c':
-                    conn = pj_pool_calloc(pool, 1, sizeof(*conn));
+                    conn = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_conn);
                     parse_connection_info(&scanner, conn, &ctx);
                     if (media) {
@@ -1064 +1064 @@
                     break;
                 case 'm':
-                    media = pj_pool_calloc(pool, 1, sizeof(*media));
+                    media = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media);
                     parse_media(&scanner, media, &ctx);
                     session->media[ session->media_count++ ] = media;
@@ -1095 +1095 @@
 
     }
-    PJ_CATCH(SYNTAX_ERROR) {
+    PJ_CATCH_ANY {
         
         char errmsg[PJ_ERR_MSG_SIZE];
@@ -1138 +1138 @@
     PJ_ASSERT_RETURN(pool && rhs, NULL);
 
-    sess = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_session));
+    sess = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session);
     PJ_ASSERT_RETURN(sess != NULL, NULL);