Changeset 1241 for pjproject/trunk/pjsip/src/pjsip/sip_uri.c
- Timestamp:
- May 2, 2007 5:14:29 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip/src/pjsip/sip_uri.c
r1221 r1241 61 61 pj_list_init(dst_list); 62 62 while (p != src_list) { 63 pjsip_param *new_param = pj_pool_alloc(pool, sizeof(pjsip_param));63 pjsip_param *new_param = PJ_POOL_ALLOC_T(pool, pjsip_param); 64 64 pj_strdup(pool, &new_param->name, &p->name); 65 65 pj_strdup(pool, &new_param->value, &p->value); … … 78 78 pj_list_init(dst_list); 79 79 while (p != src_list) { 80 pjsip_param *new_param = pj_pool_alloc(pool, sizeof(pjsip_param));80 pjsip_param *new_param = PJ_POOL_ALLOC_T(pool, pjsip_param); 81 81 new_param->name = p->name; 82 82 new_param->value = p->value; … … 137 137 static pj_str_t sip_str = { "sip", 3 }; 138 138 static pj_str_t sips_str = { "sips", 4 }; 139 140 #ifdef __GNUC__141 # define HAPPY_FLAG (void*)142 #else143 # define HAPPY_FLAG144 #endif145 139 146 140 static pjsip_name_addr* pjsip_name_addr_clone( pj_pool_t *pool, … … 161 155 const pjsip_sip_uri *rhs); 162 156 157 typedef const pj_str_t* (*P_GET_SCHEME)(const void*); 158 typedef void* (*P_GET_URI)(void*); 159 typedef pj_ssize_t (*P_PRINT_URI)(pjsip_uri_context_e,const void *, 160 char*,unsigned); 161 typedef int (*P_CMP_URI)(pjsip_uri_context_e, const void*, 162 const void*); 163 typedef void* (*P_CLONE)(pj_pool_t*, const void*); 164 165 163 166 static pjsip_uri_vptr sip_url_vptr = 164 167 { 165 HAPPY_FLAG&pjsip_url_get_scheme,166 HAPPY_FLAG&pjsip_get_uri,167 HAPPY_FLAG&pjsip_url_print,168 HAPPY_FLAG&pjsip_url_compare,169 HAPPY_FLAG&pjsip_url_clone168 (P_GET_SCHEME) &pjsip_url_get_scheme, 169 (P_GET_URI) &pjsip_get_uri, 170 (P_PRINT_URI) &pjsip_url_print, 171 (P_CMP_URI) &pjsip_url_compare, 172 (P_CLONE) &pjsip_url_clone 170 173 }; 171 174 172 175 static pjsip_uri_vptr sips_url_vptr = 173 176 { 174 HAPPY_FLAG&pjsips_url_get_scheme,175 HAPPY_FLAG&pjsip_get_uri,176 HAPPY_FLAG&pjsip_url_print,177 HAPPY_FLAG&pjsip_url_compare,178 HAPPY_FLAG&pjsip_url_clone177 (P_GET_SCHEME) &pjsips_url_get_scheme, 178 (P_GET_URI) &pjsip_get_uri, 179 (P_PRINT_URI) &pjsip_url_print, 180 (P_CMP_URI) &pjsip_url_compare, 181 (P_CLONE) &pjsip_url_clone 179 182 }; 180 183 181 184 static pjsip_uri_vptr name_addr_vptr = 182 185 { 183 HAPPY_FLAG&pjsip_name_addr_get_scheme,184 HAPPY_FLAG&pjsip_name_addr_get_uri,185 HAPPY_FLAG&pjsip_name_addr_print,186 HAPPY_FLAG&pjsip_name_addr_compare,187 HAPPY_FLAG&pjsip_name_addr_clone186 (P_GET_SCHEME) &pjsip_name_addr_get_scheme, 187 (P_GET_URI) &pjsip_name_addr_get_uri, 188 (P_PRINT_URI) &pjsip_name_addr_print, 189 (P_CMP_URI) &pjsip_name_addr_compare, 190 (P_CLONE) &pjsip_name_addr_clone 188 191 }; 189 192 … … 228 231 pj_bool_t secure ) 229 232 { 230 pjsip_sip_uri *url = pj_pool_alloc(pool, sizeof(pjsip_sip_uri));233 pjsip_sip_uri *url = PJ_POOL_ALLOC_T(pool, pjsip_sip_uri); 231 234 pjsip_sip_uri_init(url, secure); 232 235 return url; … … 497 500 static pjsip_sip_uri* pjsip_url_clone(pj_pool_t *pool, const pjsip_sip_uri *rhs) 498 501 { 499 pjsip_sip_uri *url = pj_pool_alloc(pool, sizeof(pjsip_sip_uri));502 pjsip_sip_uri *url = PJ_POOL_ALLOC_T(pool, pjsip_sip_uri); 500 503 if (!url) 501 504 return NULL; … … 521 524 PJ_DEF(pjsip_name_addr*) pjsip_name_addr_create(pj_pool_t *pool) 522 525 { 523 pjsip_name_addr *name_addr = pj_pool_alloc(pool, sizeof(pjsip_name_addr));526 pjsip_name_addr *name_addr = PJ_POOL_ALLOC_T(pool, pjsip_name_addr); 524 527 pjsip_name_addr_init(name_addr); 525 528 return name_addr; … … 535 538 pjsip_uri *uri; 536 539 537 uri = pjsip_uri_get_uri(name->uri);540 uri = (pjsip_uri*) pjsip_uri_get_uri(name->uri); 538 541 pj_assert(uri != NULL); 539 542 … … 566 569 { 567 570 pj_strdup( pool, &dst->display, &src->display); 568 dst->uri = pjsip_uri_clone(pool, src->uri);571 dst->uri = (pjsip_uri*) pjsip_uri_clone(pool, src->uri); 569 572 } 570 573 … … 572 575 const pjsip_name_addr *rhs) 573 576 { 574 pjsip_name_addr *addr = pj_pool_alloc(pool, sizeof(pjsip_name_addr));577 pjsip_name_addr *addr = PJ_POOL_ALLOC_T(pool, pjsip_name_addr); 575 578 if (!addr) 576 579 return NULL;
Note: See TracChangeset
for help on using the changeset viewer.