dougm 01/08/19 09:00:21
Modified: include apr_uri.h
uri apr_uri.c
Log:
renaming apr_uri_ api:
apr_uri_components -> apr_uri_t
apr_uri_unparse_components -> apr_uri_unparse
apr_uri_parse_components -> apr_uri_parse
apr_uri_parse_hostinfo_components -> apr_uri_parse_hostinfo
Revision Changes Path
1.6 +15 -15 apr-util/include/apr_uri.h
Index: apr_uri.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_uri.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr_uri.h 2001/08/19 15:52:18 1.5
+++ apr_uri.h 2001/08/19 16:00:21 1.6
@@ -103,12 +103,12 @@
#define APR_URI_UNP_OMITPATHINFO (1U<<4) /* Show "scheme://[EMAIL
PROTECTED]:port" only */
#define APR_URI_UNP_OMITQUERY (1U<<5) /* Omit the "?queryarg"
from the path */
-typedef struct apr_uri_components apr_uri_components;
+typedef struct apr_uri_t apr_uri_t;
/**
* A structure to encompass all of the fields in a uri
*/
-struct apr_uri_components {
+struct apr_uri_t {
/** scheme ("http"/"ftp"/...) */
char *scheme;
/** combined [user[:[EMAIL PROTECTED]:port] */
@@ -155,7 +155,7 @@
APU_DECLARE(apr_port_t) apr_uri_default_port_for_scheme(const char
*scheme_str);
/**
- * Unparse a apr_uri_components structure to an URI string. Optionally
+ * Unparse a apr_uri_t structure to an URI string. Optionally
* suppress the password for security reasons.
* @param p The pool to allocate out of
* @param uptr All of the parts of the uri
@@ -170,36 +170,36 @@
* APR_URI_UNP_OMITQUERY Omit the "?queryarg" from the path
* </PRE>
* @return The uri as a string
- * @deffunc char * apr_uri_unparse_components(apr_pool_t *p, const
apr_uri_components *uptr, unsigned flags)
+ * @deffunc char * apr_uri_unparse(apr_pool_t *p, const apr_uri_t *uptr,
unsigned flags)
*/
-APU_DECLARE(char *) apr_uri_unparse_components(apr_pool_t *p,
- const apr_uri_components
*uptr,
+APU_DECLARE(char *) apr_uri_unparse(apr_pool_t *p,
+ const apr_uri_t *uptr,
unsigned flags);
/**
- * Parse a given URI, fill in all supplied fields of a apr_uri_components
+ * Parse a given URI, fill in all supplied fields of a apr_uri_t
* structure. This eliminates the necessity of extracting host, port,
* path, query info repeatedly in the modules.
* @param p The pool to allocate out of
* @param uri The uri to parse
- * @param uptr The apr_uri_components to fill out
+ * @param uptr The apr_uri_t to fill out
* @return An HTTP status code
- * @deffunc int apr_uri_parse_components(apr_pool_t *p, const char *uri,
apr_uri_components *uptr)
+ * @deffunc int apr_uri_parse(apr_pool_t *p, const char *uri, apr_uri_t
*uptr)
*/
-APU_DECLARE(int) apr_uri_parse_components(apr_pool_t *p, const char *uri,
- apr_uri_components *uptr);
+APU_DECLARE(int) 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_components to fill out
+ * @param uptr The apr_uri_t to fill out
* @return An HTTP status code
- * @deffunc int apr_parse_hostinfo_components(apr_pool_t *p, const char
*hostinfo, apr_uri_components *uptr)
+ * @deffunc int apr_parse_hostinfo_components(apr_pool_t *p, const char
*hostinfo, apr_uri_t *uptr)
*/
-APU_DECLARE(int) apr_uri_parse_hostinfo_components(apr_pool_t *p,
+APU_DECLARE(int) apr_uri_parse_hostinfo(apr_pool_t *p,
const char *hostinfo,
- apr_uri_components *uptr);
+ apr_uri_t *uptr);
#ifdef __cplusplus
}
1.9 +7 -7 apr-util/uri/apr_uri.c
Index: apr_uri.c
===================================================================
RCS file: /home/cvs/apr-util/uri/apr_uri.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_uri.c 2001/08/19 15:52:18 1.8
+++ apr_uri.c 2001/08/19 16:00:21 1.9
@@ -119,11 +119,11 @@
return 0;
}
-/* Unparse a apr_uri_components structure to an URI string.
+/* Unparse a apr_uri_t structure to an URI string.
* Optionally suppress the password for security reasons.
*/
-APU_DECLARE(char *) apr_uri_unparse_components(apr_pool_t *p,
- const apr_uri_components
*uptr,
+APU_DECLARE(char *) apr_uri_unparse(apr_pool_t *p,
+ const apr_uri_t *uptr,
unsigned flags)
{
char *ret = "";
@@ -217,8 +217,8 @@
* - fills in fields of uri_components *uptr
* - none on any of the r->* fields
*/
-APU_DECLARE(int) apr_uri_parse_components(apr_pool_t *p, const char *uri,
- apr_uri_components *uptr)
+APU_DECLARE(int) apr_uri_parse(apr_pool_t *p, const char *uri,
+ apr_uri_t *uptr)
{
const char *s;
const char *s1;
@@ -342,9 +342,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_components(apr_pool_t *p,
+APU_DECLARE(int) apr_uri_parse_hostinfo(apr_pool_t *p,
const char *hostinfo,
- apr_uri_components *uptr)
+ apr_uri_t *uptr)
{
const char *s;
char *endstr;
