apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r372443 - in /apr/apr-util/branches/1.2.x: include/apr_uri.h uri/apr_uri.c
Date Thu, 26 Jan 2006 05:10:17 GMT
Author: rooneg
Date: Wed Jan 25 21:10:16 2006
New Revision: 372443

URL: http://svn.apache.org/viewcvs?rev=372443&view=rev
Log:
Merge r359522 to 1.2.x.

Original log message:

Fix declarations in apr_uri API.

Modified:
    apr/apr-util/branches/1.2.x/include/apr_uri.h
    apr/apr-util/branches/1.2.x/uri/apr_uri.c

Modified: apr/apr-util/branches/1.2.x/include/apr_uri.h
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/include/apr_uri.h?rev=372443&r1=372442&r2=372443&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apr_uri.h (original)
+++ apr/apr-util/branches/1.2.x/include/apr_uri.h Wed Jan 25 21:10:16 2006
@@ -154,21 +154,21 @@
  * @param p The pool to allocate out of
  * @param uri The uri to parse
  * @param uptr The apr_uri_t to fill out
- * @return 0 for success or error code
+ * @return APR_SUCCESS for success or error code
  */
-APU_DECLARE(int) apr_uri_parse(apr_pool_t *p, const char *uri, 
-                               apr_uri_t *uptr);
+APU_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, 
+                                        apr_uri_t *uptr);
 
 /**
  * Special case for CONNECT parsing: it comes with the hostinfo part only
  * @param p The pool to allocate out of
  * @param hostinfo The hostinfo string to parse
  * @param uptr The apr_uri_t to fill out
- * @return 0 for success or error code
+ * @return APR_SUCCESS for success or error code
  */
-APU_DECLARE(int) apr_uri_parse_hostinfo(apr_pool_t *p, 
-                                        const char *hostinfo, 
-                                        apr_uri_t *uptr);
+APU_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, 
+                                                 const char *hostinfo, 
+                                                 apr_uri_t *uptr);
 
 /** @} */
 #ifdef __cplusplus

Modified: apr/apr-util/branches/1.2.x/uri/apr_uri.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/uri/apr_uri.c?rev=372443&r1=372442&r2=372443&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/uri/apr_uri.c (original)
+++ apr/apr-util/branches/1.2.x/uri/apr_uri.c Wed Jan 25 21:10:16 2006
@@ -253,8 +253,8 @@
  *  - fills in fields of uri_components *uptr
  *  - none on any of the r->* fields
  */
-APU_DECLARE(int) apr_uri_parse(apr_pool_t *p, const char *uri, 
-                               apr_uri_t *uptr)
+APU_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, 
+                                        apr_uri_t *uptr)
 {
     const char *s;
     const char *s1;
@@ -413,9 +413,9 @@
  * currently at http://www.mcom.com/newsref/std/tunneling_ssl.html
  * for the format of the "CONNECT host:port HTTP/1.0" request
  */
-APU_DECLARE(int) apr_uri_parse_hostinfo(apr_pool_t *p, 
-                                        const char *hostinfo, 
-                                        apr_uri_t *uptr)
+APU_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, 
+                                                 const char *hostinfo, 
+                                                 apr_uri_t *uptr)
 {
     const char *s;
     char *endstr;



Mime
View raw message