diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2000-07-29 22:32:21 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2000-07-29 22:32:21 +0000 |
| commit | 677df784c183b4e6aa7c4ae03d88a7ac02efee05 (patch) | |
| tree | de1e41d7447e51dd5c6ea22942868ec267644994 /ext/standard/url.c | |
| parent | 5fdc09fb364e838b188adcabebdc88acabe8ec24 (diff) | |
| download | php-git-677df784c183b4e6aa7c4ae03d88a7ac02efee05.tar.gz | |
This url symbol was a bit too generic. Change it to php_url instead.
It was clashing with a similar typedef in the UdmSearch integration I am
working on.
Diffstat (limited to 'ext/standard/url.c')
| -rw-r--r-- | ext/standard/url.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c index 9b159d8887..d1d6496565 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -37,7 +37,7 @@ #endif /*_OSD_POSIX*/ -void free_url(url * theurl) +void free_url(php_url * theurl) { if (theurl->scheme) efree(theurl->scheme); @@ -56,7 +56,7 @@ void free_url(url * theurl) efree(theurl); } -url *url_parse(char *str) +php_url *url_parse(char *str) { regex_t re; regmatch_t subs[10]; @@ -64,12 +64,12 @@ url *url_parse(char *str) int length = strlen(str); char *result; - url *ret = (url *) emalloc(sizeof(url)); + php_url *ret = (php_url *) emalloc(sizeof(php_url)); if (!ret) { /*php_error(E_WARNING,"Unable to allocate memory\n");*/ return NULL; } - memset(ret, 0, sizeof(url)); + memset(ret, 0, sizeof(php_url)); /* from Appendix B of draft-fielding-url-syntax-09, http://www.ics.uci.edu/~fielding/url/url.txt */ @@ -161,7 +161,7 @@ url *url_parse(char *str) PHP_FUNCTION(parse_url) { pval **str; - url *resource; + php_url *resource; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; |