diff options
| author | Zeev Suraski <zeev@php.net> | 1999-08-02 19:17:14 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-08-02 19:17:14 +0000 |
| commit | 3cb1eb047187d53688545ae6f64d4df880298e72 (patch) | |
| tree | 7fb20f178b9df5a33a83a2b7537f5614910697c0 /ext/standard/url.c | |
| parent | 07e0885519ccabbd9cebfce7223be657171a6629 (diff) | |
| download | php-git-3cb1eb047187d53688545ae6f64d4df880298e72.tar.gz | |
Removed '3' from key functions in PHP (maintained compatibility through
php3_compat.h)
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 40b178f531..96a6ee2c4e 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -67,7 +67,7 @@ url *url_parse(char *string) url *ret = (url *) emalloc(sizeof(url)); if (!ret) { - /*php3_error(E_WARNING,"Unable to allocate memory\n");*/ + /*php_error(E_WARNING,"Unable to allocate memory\n");*/ return NULL; } memset(ret, 0, sizeof(url)); @@ -76,13 +76,13 @@ url *url_parse(char *string) http://www.ics.uci.edu/~fielding/url/url.txt */ err = regcomp(&re, "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?", REG_EXTENDED); if (err) { - /*php3_error(E_WARNING,"Unable to compile regex: %d\n", err);*/ + /*php_error(E_WARNING,"Unable to compile regex: %d\n", err);*/ efree(ret); return NULL; } err = regexec(&re, string, 10, subs, 0); if (err) { - /*php3_error(E_WARNING,"Error with regex\n");*/ + /*php_error(E_WARNING,"Error with regex\n");*/ efree(ret); return NULL; } @@ -122,7 +122,7 @@ url *url_parse(char *string) STR_FREE(ret->fragment); efree(ret); efree(result); - /*php3_error(E_WARNING,"Unable to compile regex: %d\n", err);*/ + /*php_error(E_WARNING,"Unable to compile regex: %d\n", err);*/ return NULL; } /* now deal with all of the results */ @@ -159,7 +159,7 @@ PHP_FUNCTION(parse_url) resource = url_parse(string->value.str.val); if (resource == NULL) { - php3_error(E_WARNING, "unable to parse url (%s)", string->value.str.val); + php_error(E_WARNING, "unable to parse url (%s)", string->value.str.val); RETURN_FALSE; } /* allocate an array for return */ |