Author: astitcher
Date: Fri Mar 7 21:14:21 2014
New Revision: 1575411
URL: http://svn.apache.org/r1575411
Log:
NO-JIRA: Add missing prefix to parse_url()
- Also added some simple documentation
Modified:
qpid/proton/trunk/proton-c/include/proton/util.h
qpid/proton/trunk/proton-c/src/messenger/messenger.c
qpid/proton/trunk/proton-c/src/proton.c
qpid/proton/trunk/proton-c/src/util.c
Modified: qpid/proton/trunk/proton-c/include/proton/util.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/util.h?rev=1575411&r1=1575410&r2=1575411&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/util.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/util.h Fri Mar 7 21:14:21 2014
@@ -29,7 +29,7 @@
extern "C" {
#endif
-PN_EXTERN void parse_url(char *url, char **scheme, char **user, char **pass,
char **host, char **port, char **path);
+PN_EXTERN void pni_parse_url(char *url, char **scheme, char **user, char
**pass, char **host, char **port, char **path);
PN_EXTERN void pn_fatal(const char *fmt, ...);
PN_EXTERN void pn_vfatal(const char *fmt, va_list ap);
Modified: qpid/proton/trunk/proton-c/src/messenger/messenger.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger/messenger.c?rev=1575411&r1=1575410&r2=1575411&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger/messenger.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger/messenger.c Fri Mar 7 21:14:21
2014
@@ -1401,7 +1401,7 @@ static void pni_parse(pn_address_t *addr
address->host = NULL;
address->port = NULL;
address->name = NULL;
- parse_url(pn_string_buffer(address->text), &address->scheme, &address->user,
+ pni_parse_url(pn_string_buffer(address->text), &address->scheme,
&address->user,
&address->pass, &address->host, &address->port, &address->name);
if (address->host[0] == '~') {
address->passive = true;
Modified: qpid/proton/trunk/proton-c/src/proton.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/proton.c?rev=1575411&r1=1575410&r2=1575411&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/proton.c (original)
+++ qpid/proton/trunk/proton-c/src/proton.c Fri Mar 7 21:14:21 2014
@@ -473,7 +473,7 @@ int main(int argc, char **argv)
char *port = (char *) "5672";
char *path = NULL;
- parse_url(url, &scheme, &user, &pass, &host, &port, &path);
+ pni_parse_url(url, &scheme, &user, &pass, &host, &port, &path);
pn_driver_t *drv = pn_driver();
if (url) {
Modified: qpid/proton/trunk/proton-c/src/util.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/util.c?rev=1575411&r1=1575410&r2=1575411&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/util.c (original)
+++ qpid/proton/trunk/proton-c/src/util.c Fri Mar 7 21:14:21 2014
@@ -106,7 +106,11 @@ void pn_print_data(const char *bytes, si
pn_fprint_data(stdout, bytes, size);
}
-void parse_url(char *url, char **scheme, char **user, char **pass, char
**host, char **port, char **path)
+// Parse URL syntax:
+// [ <scheme> :// ] [ <user> [ : <password> ] @ ] <host> [ : <port> ] [ /
<path> ]
+// <user>, <password>, <host>, <port> cannot contain any of '@', ':', '/'
+// <path> can contain any character
+void pni_parse_url(char *url, char **scheme, char **user, char **pass, char
**host, char **port, char **path)
{
if (url) {
char *scheme_end = strstr(url, "://");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
