Changeset 1241 for pjproject/trunk/pjsip/src/pjsip-simple/pidf.c

Timestamp:

May 2, 2007 5:14:29 AM (17 years ago)

Author:

bennylp

Message:

Ported PJSIP and PJSIP-SIMPLE to Symbian

File:

• pjproject/trunk/pjsip/src/pjsip-simple/pidf.c (modified) (12 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/pidf.c

@@ -89 +89 @@
                                     const pj_str_t *value)
 {
-    pj_xml_attr *attr = pj_pool_alloc(pool, sizeof(*attr));
+    pj_xml_attr *attr = PJ_POOL_ALLOC_T(pool, pj_xml_attr);
     attr->name = *name;
     pj_strdup(pool, &attr->value, value);
@@ -111 +111 @@
                                             const pj_str_t *id)
 {
-    pjpidf_tuple *t = pj_pool_alloc(pool, sizeof(*t));
+    pjpidf_tuple *t = PJ_POOL_ALLOC_T(pool, pjpidf_tuple);
     pjpidf_tuple_construct(pool, t, id);
     pj_xml_add_node(pres, t);
@@ -130 +130 @@
 static pj_bool_t find_tuple_by_id(pj_xml_node *node, const void *id)
 {
-    return pj_xml_find_attr(node, &ID, id) != NULL;
+    return pj_xml_find_attr(node, &ID, (const pj_str_t*)id) != NULL;
 }
 
@@ -147 +147 @@
                                           const pj_str_t *text)
 {
-    pjpidf_note *note = pj_pool_alloc(pool, sizeof(*note));
+    pjpidf_note *note = PJ_POOL_ALLOC_T(pool, pjpidf_note);
     xml_init_node(pool, note, &NOTE, text);
     pj_xml_add_node(pres, note);
@@ -174 +174 @@
     attr = xml_create_attr(pool, &ID, id);
     pj_xml_add_attr(t, attr);
-    st = pj_pool_alloc(pool, sizeof(*st));
+    st = PJ_POOL_ALLOC_T(pool, pjpidf_status);
     pjpidf_status_construct(pool, st);
     pj_xml_add_node(t, st);
@@ -215 +215 @@
     pj_xml_node *node = pj_xml_find_node(t, &CONTACT);
     if (!node) {
-        node = pj_pool_alloc(pool, sizeof(*node));
+        node = PJ_POOL_ALLOC_T(pool, pj_xml_node);
         xml_init_node(pool, node, &CONTACT, contact);
         pj_xml_add_node(t, node);
@@ -230 +230 @@
 
     if (!node) {
-        node = pj_pool_alloc(pool, sizeof(*node));
+        node = PJ_POOL_ALLOC_T(pool, pj_xml_node);
         xml_init_node(pool, node, &CONTACT, NULL);
         pj_xml_add_node(t, node);
@@ -260 +260 @@
                                            const pj_str_t *text)
 {
-    pjpidf_note *note = pj_pool_alloc(pool, sizeof(*note));
+    pjpidf_note *note = PJ_POOL_ALLOC_T(pool, pjpidf_note);
     xml_init_node(pool, note, &NOTE, text);
     pj_xml_add_node(t, note);
@@ -288 +288 @@
     pj_xml_node *node = pj_xml_find_node(t, &TIMESTAMP);
     if (!node) {
-        node = pj_pool_alloc(pool, sizeof(*node));
+        node = PJ_POOL_ALLOC_T(pool, pj_xml_node);
         xml_init_node(pool, node, &TIMESTAMP, ts);
     } else {
@@ -301 +301 @@
     pj_xml_node *node = pj_xml_find_node(t, &TIMESTAMP);
     if (!node) {
-        node = pj_pool_alloc(pool, sizeof(*node));
+        node = PJ_POOL_ALLOC_T(pool, pj_xml_node);
         xml_init_node(pool, node, &TIMESTAMP, ts);
     } else {
@@ -315 +315 @@
 
     xml_init_node(pool, st, &STATUS, NULL);
-    node = pj_pool_alloc(pool, sizeof(*node));
+    node = PJ_POOL_ALLOC_T(pool, pj_xml_node);
     xml_init_node(pool, node, &BASIC, &CLOSED);
     pj_xml_add_node(st, node);
@@ -336 +336 @@
 PJ_DEF(pjpidf_pres*) pjpidf_create(pj_pool_t *pool, const pj_str_t *entity)
 {
-    pjpidf_pres *pres = pj_pool_alloc(pool, sizeof(*pres));
+    pjpidf_pres *pres = PJ_POOL_ALLOC_T(pool, pjpidf_pres);
     pjpidf_pres_construct(pool, pres, entity);
     return pres;