Changeset 127 for pjproject/trunk/pjsip/src/pjsip/sip_uri.c

Timestamp:

Jan 30, 2006 6:40:05 PM (18 years ago)

Author:

bennylp

Message:

Finished implementation of UA layer (to be tested)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_uri.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_uri.c

@@ -141 +141 @@
 static pjsip_name_addr* pjsip_name_addr_clone( pj_pool_t *pool, 
                                                const pjsip_name_addr *rhs);
-static int pjsip_name_addr_print( pjsip_uri_context_e context,
-                                  const pjsip_name_addr *name, 
-                                  char *buf, pj_size_t size);
+static pj_ssize_t pjsip_name_addr_print(pjsip_uri_context_e context,
+                                        const pjsip_name_addr *name, 
+                                        char *buf, pj_size_t size);
 static int pjsip_name_addr_compare(  pjsip_uri_context_e context,
                                      const pjsip_name_addr *naddr1,
                                      const pjsip_name_addr *naddr2);
-static int pjsip_url_print(  pjsip_uri_context_e context,
-                             const pjsip_sip_uri *url, 
-                             char *buf, pj_size_t size);
+static pj_ssize_t pjsip_url_print(  pjsip_uri_context_e context,
+                                    const pjsip_sip_uri *url, 
+                                    char *buf, pj_size_t size);
 static int pjsip_url_compare( pjsip_uri_context_e context,
                               const pjsip_sip_uri *url1, 
@@ -205 +205 @@
 }
 
-PJ_DEF(void) pjsip_url_init(pjsip_sip_uri *url, int secure)
+PJ_DEF(void) pjsip_sip_uri_init(pjsip_sip_uri *url, int secure)
 {
     pj_memset(url, 0, sizeof(*url));
@@ -214 +214 @@
 }
 
-PJ_DEF(pjsip_sip_uri*) pjsip_url_create( pj_pool_t *pool, int secure )
+PJ_DEF(pjsip_sip_uri*) pjsip_sip_uri_create( pj_pool_t *pool, int secure )
 {
     pjsip_sip_uri *url = pj_pool_alloc(pool, sizeof(pjsip_sip_uri));
-    pjsip_url_init(url, secure);
+    pjsip_sip_uri_init(url, secure);
     return url;
 }
 
-static int pjsip_url_print(  pjsip_uri_context_e context,
-                             const pjsip_sip_uri *url, 
-                             char *buf, pj_size_t size)
+static pj_ssize_t pjsip_url_print(  pjsip_uri_context_e context,
+                                    const pjsip_sip_uri *url, 
+                                    char *buf, pj_size_t size)
 {
     int printed;
@@ -466 +466 @@
 
 
-PJ_DEF(void) pjsip_url_assign(pj_pool_t *pool, pjsip_sip_uri *url, 
-                              const pjsip_sip_uri *rhs)
+PJ_DEF(void) pjsip_sip_uri_assign(pj_pool_t *pool, pjsip_sip_uri *url, 
+                                  const pjsip_sip_uri *rhs)
 {
     pj_strdup( pool, &url->user, &rhs->user);
@@ -489 +489 @@
         return NULL;
 
-    pjsip_url_init(url, IS_SIPS(rhs));
-    pjsip_url_assign(pool, url, rhs);
+    pjsip_sip_uri_init(url, IS_SIPS(rhs));
+    pjsip_sip_uri_assign(pool, url, rhs);
     return url;
 }
@@ -514 +514 @@
 }
 
-static int pjsip_name_addr_print( pjsip_uri_context_e context,
-                                  const pjsip_name_addr *name, 
-                                  char *buf, pj_size_t size)
+static pj_ssize_t pjsip_name_addr_print(pjsip_uri_context_e context,
+                                        const pjsip_name_addr *name, 
+                                        char *buf, pj_size_t size)
 {
     int printed;