Re: svn commit: r359522 - in /apr/apr-util/trunk: include/apr_uri.h uri/apr_uri.c

[William A. Rowe, Jr.]

Veto - you've broken ABI.

Please revert, and @bug this in doxygen that it must be fixed in 2.0.

Bill

[EMAIL PROTECTED] wrote:

Author: niq
Date: Wed Dec 28 05:49:22 2005
New Revision: 359522

URL: http://svn.apache.org/viewcvs?rev=359522&view=rev
Log:
Fix declarations in apr_uri API.

Modified:
    apr/apr-util/trunk/include/apr_uri.h
    apr/apr-util/trunk/uri/apr_uri.c

Modified: apr/apr-util/trunk/include/apr_uri.h
URL: 
http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_uri.h?rev=359522&r1=359521&r2=359522&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_uri.h (original)
+++ apr/apr-util/trunk/include/apr_uri.h Wed Dec 28 05:49:22 2005
@@ -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/trunk/uri/apr_uri.c
URL: 
http://svn.apache.org/viewcvs/apr/apr-util/trunk/uri/apr_uri.c?rev=359522&r1=359521&r2=359522&view=diff
==============================================================================
--- apr/apr-util/trunk/uri/apr_uri.c (original)
+++ apr/apr-util/trunk/uri/apr_uri.c Wed Dec 28 05:49:22 2005
@@ -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;