cvs: /php4/dl/snmp winsnmp.c /php4/ext/gd gd.c gdttf.c gdttf.h /php4/ext/imap imap.c /php4/ext/pcre/pcrelib pcreposix.c /php4/ext/standard base64.c
php_string.h string.c url.c

zeev Tue Feb 8 14:21:44 2000 EDT Modified files: /php4/dl/snmp winsnmp.c /php4/ext/gd gd.c gdttf.c gdttf.h /php4/ext/imap imap.c /php4/ext/pcre/pcrelib pcreposix.c /php4/ext/standard base64.c php_string.h string.c url.c Log: Change string->str where possible; string is basic a C++ class, so gdb can't look inside variables named 'string'. Index: php4/dl/snmp/winsnmp.c diff -u php4/dl/snmp/winsnmp.c:1.4 php4/dl/snmp/winsnmp.c:1.5 --- php4/dl/snmp/winsnmp.c:1.4 Fri Dec 17 12:54:41 1999 +++ php4/dl/snmp/winsnmp.c Tue Feb 8 14:21:42 2000 @@ -116,13 +116,13 @@ } else { /* Display the resulting variable bindings.*/ UINT i; - char *string = NULL; + char *str = NULL; for(i=0; i < variableBindings.len; i++) { - SnmpMgrOidToStr(&variableBindings.list[i].name, &string); - php_printf("Variable = %s\n", string); - if (string) SNMP_free(string); + SnmpMgrOidToStr(&variableBindings.list[i].name, &str); + php_printf("Variable = %s\n", str); + if (str) SNMP_free(str); php_printf("Value = "); SnmpUtilPrintAsnAny(&variableBindings.list[i].value); @@ -177,11 +177,11 @@ else { /* Display resulting variable binding for this iteration. */ - char *string = NULL; + char *str = NULL; - SnmpMgrOidToStr(&variableBindings.list[0].name, &string); - php_printf("Variable = %s\n", string); - if (string) SNMP_free(string); + SnmpMgrOidToStr(&variableBindings.list[0].name, &str); + php_printf("Variable = %s\n", str); + if (str) SNMP_free(str); php_printf("Value = "); SnmpUtilPrintAsnAny(&variableBindings.list[0].value); Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.35 php4/ext/gd/gd.c:1.36 --- php4/ext/gd/gd.c:1.35 Mon Jan 24 12:25:57 2000 +++ php4/ext/gd/gd.c Tue Feb 8 14:21:43 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.35 2000/01/24 20:25:57 eschmid Exp $ */ +/* $Id: gd.c,v 1.36 2000/02/08 22:21:43 zeev Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1591,7 +1591,7 @@ pval *IM, *SIZE, *X, *Y, *C, *COL; gdImagePtr im; int ch = 0, col, x, y, size, i, l = 0; - unsigned char *string = NULL; + unsigned char *str = NULL; int ind_type; gdFontPtr font; GD_TLS_VARS; @@ -1613,8 +1613,8 @@ if (mode < 2) { ch = (int)((unsigned char)*(C->value.str.val)); } else { - string = (unsigned char *) estrndup(C->value.str.val,C->value.str.len); - l = strlen(string); + str = (unsigned char *) estrndup(C->value.str.val,C->value.str.len); + l = strlen(str); } y = Y->value.lval; @@ -1624,8 +1624,8 @@ im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); - if (string) { - efree(string); + if (str) { + efree(str); } RETURN_FALSE; } @@ -1641,22 +1641,22 @@ break; case 2: for (i = 0; (i < l); i++) { - gdImageChar(im, font, x, y, (int)((unsigned char)string[i]), + gdImageChar(im, font, x, y, (int)((unsigned char)str[i]), col); x += font->w; } break; case 3: { for (i = 0; (i < l); i++) { - /* php_gdimagecharup(im, font, x, y, (int)string[i], col); */ - gdImageCharUp(im, font, x, y, (int)string[i], col); + /* php_gdimagecharup(im, font, x, y, (int)str[i], col); */ + gdImageCharUp(im, font, x, y, (int)str[i], col); y -= font->w; } break; } } - if (string) { - efree(string); + if (str) { + efree(str); } RETURN_TRUE; } @@ -1869,7 +1869,7 @@ int col, x, y, l=0, i; int brect[8]; double ptsize, angle; - unsigned char *string = NULL, *fontname = NULL; + unsigned char *str = NULL, *fontname = NULL; int ind_type; char *error; @@ -1910,11 +1910,11 @@ ptsize = PTSIZE->value.dval; angle = ANGLE->value.dval * (M_PI/180); /* convert to radians */ - string = (unsigned char *) C->value.str.val; - l = strlen(string); + str = (unsigned char *) C->value.str.val; + l = strlen(str); fontname = (unsigned char *) FONTNAME->value.str.val; - error = gdttf(im, brect, col, fontname, ptsize, angle, x, y, string); + error = gdttf(im, brect, col, fontname, ptsize, angle, x, y, str); if (error) { php_error(E_WARNING, error); Index: php4/ext/gd/gdttf.c diff -u php4/ext/gd/gdttf.c:1.6 php4/ext/gd/gdttf.c:1.7 --- php4/ext/gd/gdttf.c:1.6 Wed Dec 1 14:59:44 1999 +++ php4/ext/gd/gdttf.c Tue Feb 8 14:21:43 2000 @@ -2,7 +2,7 @@ /* */ /* John Ellson ellson@lucent.com */ -/* $Id: gdttf.c,v 1.6 1999/12/01 22:59:44 ssb Exp $ */ +/* $Id: gdttf.c,v 1.7 2000/02/08 22:21:43 zeev Exp $ */ #if WIN32|WINNT #include "config.w32.h" @@ -719,7 +719,7 @@ char * gdttf(gdImage *im, int *brect, int fg, char *fontname, - double ptsize, double angle, int x, int y, char *string) + double ptsize, double angle, int x, int y, char *str) { TT_F26Dot6 ur_x=0, ur_y=0, ll_x=0, ll_y=0; TT_F26Dot6 advance_x, advance_y, advance, x1, y1; @@ -756,7 +756,7 @@ cos_a = font->cos_a; advance_x = advance_y = 0; - next=string; + next=str; while (*next) { ch = *next; Index: php4/ext/gd/gdttf.h diff -u php4/ext/gd/gdttf.h:1.1 php4/ext/gd/gdttf.h:1.2 --- php4/ext/gd/gdttf.h:1.1 Fri Apr 16 05:15:38 1999 +++ php4/ext/gd/gdttf.h Tue Feb 8 14:21:43 2000 @@ -1,4 +1,4 @@ -/* $Id: gdttf.h,v 1.1 1999/04/16 12:15:38 ssb Exp $ */ +/* $Id: gdttf.h,v 1.2 2000/02/08 22:21:43 zeev Exp $ */ #ifdef _OSD_POSIX #ifndef APACHE @@ -12,5 +12,5 @@ #endif /*_OSD_POSIX*/ char * gdttf(gdImage *im, int *brect, int fg, char *fontname, - double ptsize, double angle, int x, int y, char *string); + double ptsize, double angle, int x, int y, char *str); Index: php4/ext/imap/imap.c diff -u php4/ext/imap/imap.c:1.32 php4/ext/imap/imap.c:1.33 --- php4/ext/imap/imap.c:1.32 Mon Feb 7 07:52:47 2000 +++ php4/ext/imap/imap.c Tue Feb 8 14:21:43 2000 @@ -21,7 +21,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: imap.c,v 1.32 2000/02/07 15:52:47 hholzgra Exp $ */ +/* $Id: imap.c,v 1.33 2000/02/08 22:21:43 zeev Exp $ */ #define IMAP41 @@ -73,7 +73,7 @@ msvc */ void rfc822_date(char *date); -extern char *cpystr(const char *string); +extern char *cpystr(const char *str); extern unsigned long find_rightmost_bit (unsigned long *valptr); void fs_give (void **block); void *fs_get (size_t size); @@ -2430,19 +2430,19 @@ Parses an address string */ PHP_FUNCTION(imap_rfc822_parse_adrlist) { - pval *string,*defaulthost,*tovals; + pval *str,*defaulthost,*tovals; ADDRESS *addresstmp; ENVELOPE *env; int argc; env=mail_newenvelope(); argc=ARG_COUNT(ht); - if ( argc != 2 || getParameters( ht, argc, &string,&defaulthost) == FAILURE ) { + if ( argc != 2 || getParameters( ht, argc, &str,&defaulthost) == FAILURE ) { WRONG_PARAM_COUNT; } - convert_to_string(string); + convert_to_string(str); convert_to_string(defaulthost); - rfc822_parse_adrlist(&env->to,string->value.str.val,defaulthost->value.str.val); + rfc822_parse_adrlist(&env->to,str->value.str.val,defaulthost->value.str.val); if(array_init(return_value) == FAILURE) { RETURN_FALSE; } @@ -2465,7 +2465,7 @@ Convert a string to UTF-8 */ PHP_FUNCTION(imap_utf8) { - pval *string; + pval *str; int argc; SIZEDTEXT src,dest; src.data=NULL; @@ -2474,11 +2474,11 @@ dest.size=0; argc=ARG_COUNT(ht); - if ( argc != 1 || getParameters( ht, argc, &string) == FAILURE ) { + if ( argc != 1 || getParameters( ht, argc, &str) == FAILURE ) { WRONG_PARAM_COUNT; } - convert_to_string(string); - cpytxt(&src,string->value.str.val,string->value.str.len); + convert_to_string(str); + cpytxt(&src,str->value.str.val,str->value.str.len); utf8_mime2text(&src,&dest); RETURN_STRINGL(dest.data,strlen(dest.data),1); } @@ -3739,14 +3739,14 @@ /* Author: CJH */ -void mm_notify (MAILSTREAM *stream,char *string, long errflg) +void mm_notify (MAILSTREAM *stream,char *str, long errflg) { STRINGLIST *cur = NIL; - if (strncmp(string, "[ALERT] ", 8) == 0) { + if (strncmp(str, "[ALERT] ", 8) == 0) { if (imap_alertstack == NIL) { imap_alertstack = mail_newstringlist(); - imap_alertstack->LSIZE = strlen(imap_alertstack->LTEXT = cpystr(string)); + imap_alertstack->LSIZE = strlen(imap_alertstack->LTEXT = cpystr(str)); imap_alertstack->next = NIL; } else { cur = imap_alertstack; @@ -3755,7 +3755,7 @@ } cur->next = mail_newstringlist (); cur = cur->next; - cur->LSIZE = strlen(cur->LTEXT = cpystr(string)); + cur->LSIZE = strlen(cur->LTEXT = cpystr(str)); cur->next = NIL; } } @@ -3871,7 +3871,7 @@ #endif } -void mm_log (char *string,long errflg) +void mm_log (char *str,long errflg) { ERRORLIST *cur = NIL; @@ -3879,7 +3879,7 @@ if (errflg != NIL) { /* CJH: maybe put these into a more comprehensive log for debugging purposes? */ if (imap_errorstack == NIL) { imap_errorstack = mail_newerrorlist(); - imap_errorstack->LSIZE = strlen(imap_errorstack->LTEXT = cpystr(string)); + imap_errorstack->LSIZE = strlen(imap_errorstack->LTEXT = cpystr(str)); imap_errorstack->errflg = errflg; imap_errorstack->next = NIL; } else { @@ -3889,14 +3889,14 @@ } cur->next = mail_newerrorlist (); cur = cur->next; - cur->LSIZE = strlen(cur->LTEXT = cpystr(string)); + cur->LSIZE = strlen(cur->LTEXT = cpystr(str)); cur->errflg = errflg; cur->next = NIL; } } } -void mm_dlog (char *string) +void mm_dlog (char *str) { /* CJH: this is for debugging; it might be useful to allow setting the stream to debug mode and capturing this somewhere - syslog? @@ -3943,7 +3943,7 @@ } -void mm_fatal (char *string) +void mm_fatal (char *str) { } Index: php4/ext/pcre/pcrelib/pcreposix.c diff -u php4/ext/pcre/pcrelib/pcreposix.c:1.3 php4/ext/pcre/pcrelib/pcreposix.c:1.4 --- php4/ext/pcre/pcrelib/pcreposix.c:1.3 Tue Sep 14 12:24:37 1999 +++ php4/ext/pcre/pcrelib/pcreposix.c Tue Feb 8 14:21:43 2000 @@ -212,7 +212,7 @@ *************************************************/ int -regexec(regex_t *preg, const char *string, size_t nmatch, +regexec(regex_t *preg, const char *str, size_t nmatch, regmatch_t pmatch[], int eflags) { int rc; @@ -223,7 +223,7 @@ preg->re_erroffset = (size_t)(-1); /* Only has meaning after compile */ -rc = pcre_exec(preg->re_pcre, NULL, string, (int)strlen(string), 0, options, +rc = pcre_exec(preg->re_pcre, NULL, str, (int)strlen(str), 0, options, (int *)pmatch, nmatch * 2); if (rc == 0) return 0; /* All pmatch were filled in */ Index: php4/ext/standard/base64.c diff -u php4/ext/standard/base64.c:1.14 php4/ext/standard/base64.c:1.15 --- php4/ext/standard/base64.c:1.14 Sun Feb 6 07:18:59 2000 +++ php4/ext/standard/base64.c Tue Feb 8 14:21:43 2000 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.c,v 1.14 2000/02/06 15:18:59 thies Exp $ */ +/* $Id: base64.c,v 1.15 2000/02/08 22:21:43 zeev Exp $ */ #include <string.h> @@ -31,8 +31,8 @@ }; static char base64_pad = '='; -unsigned char *php_base64_encode(const unsigned char *string, int length, int *ret_length) { - const unsigned char *current = string; +unsigned char *php_base64_encode(const unsigned char *str, int length, int *ret_length) { + const unsigned char *current = str; int i = 0; unsigned char *result = (unsigned char *)emalloc(((length + 3 - length % 3) * 4 / 3 + 1) * sizeof(char)); @@ -68,8 +68,8 @@ } /* as above, but backwards. :) */ -unsigned char *php_base64_decode(const unsigned char *string, int length, int *ret_length) { - const unsigned char *current = string; +unsigned char *php_base64_decode(const unsigned char *str, int length, int *ret_length) { + const unsigned char *current = str; int ch, i = 0, j = 0, k; /* this sucks for threaded environments */ static short reverse_table[256]; @@ -142,15 +142,15 @@ /* {{{ proto string base64_encode(string str) Encodes string using MIME base64 algorithm */ PHP_FUNCTION(base64_encode) { - pval **string; + pval **str; unsigned char *result; int ret_length; - if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1,&string) == FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1,&str) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string_ex(string); - result = php_base64_encode((*string)->value.str.val, (*string)->value.str.len, &ret_length); + convert_to_string_ex(str); + result = php_base64_encode((*str)->value.str.val, (*str)->value.str.len, &ret_length); if (result != NULL) { return_value->value.str.val = result; return_value->value.str.len = ret_length; @@ -165,15 +165,15 @@ /* {{{ proto string base64_decode(string str) Decodes string using MIME base64 algorithm */ PHP_FUNCTION(base64_decode) { - pval **string; + pval **str; unsigned char *result; int ret_length; - if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1,&string) == FAILURE) { + if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1,&str) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string_ex(string); - result = php_base64_decode((*string)->value.str.val, (*string)->value.str.len, &ret_length); + convert_to_string_ex(str); + result = php_base64_decode((*str)->value.str.val, (*str)->value.str.len, &ret_length); if (result != NULL) { return_value->value.str.val = result; return_value->value.str.len = ret_length; Index: php4/ext/standard/php_string.h diff -u php4/ext/standard/php_string.h:1.8 php4/ext/standard/php_string.h:1.9 --- php4/ext/standard/php_string.h:1.8 Tue Feb 8 13:29:18 2000 +++ php4/ext/standard/php_string.h Tue Feb 8 14:21:43 2000 @@ -29,7 +29,7 @@ */ -/* $Id: php_string.h,v 1.8 2000/02/08 21:29:18 zeev Exp $ */ +/* $Id: php_string.h,v 1.9 2000/02/08 22:21:43 zeev Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -85,11 +85,11 @@ extern PHPAPI char *php_strtoupper(char *s, size_t len); extern PHPAPI char *php_strtolower(char *s, size_t len); -extern PHPAPI char *php_strtr(char *string, int len, char *str_from, char *str_to, int trlen); -extern PHPAPI char *php_addslashes(char *string, int length, int *new_length, int freeit); -extern PHPAPI char *php_addcslashes(char *string, int length, int *new_length, int freeit, char *what, int wlength); -extern PHPAPI void php_stripslashes(char *string, int *len); -extern PHPAPI void php_stripcslashes(char *string, int *len); +extern PHPAPI char *php_strtr(char *str, int len, char *str_from, char *str_to, int trlen); +extern PHPAPI char *php_addslashes(char *str, int length, int *new_length, int freeit); +extern PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int freeit, char *what, int wlength); +extern PHPAPI void php_stripslashes(char *str, int *len); +extern PHPAPI void php_stripcslashes(char *str, int *len); extern PHPAPI void php_dirname(char *str, int len); extern PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t t_len); extern PHPAPI char *php_str_to_str(char *haystack, int length, char *needle, Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.92 php4/ext/standard/string.c:1.93 --- php4/ext/standard/string.c:1.92 Tue Feb 8 13:29:18 2000 +++ php4/ext/standard/string.c Tue Feb 8 14:21:43 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.92 2000/02/08 21:29:18 zeev Exp $ */ +/* $Id: string.c,v 1.93 2000/02/08 22:21:43 zeev Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -858,23 +858,23 @@ Return part of a string */ PHP_FUNCTION(substr) { - zval **string, **from, **len; + zval **str, **from, **len; int argc, l; int f; argc = ARG_COUNT(ht); - if ((argc == 2 && zend_get_parameters_ex(2, &string, &from) == FAILURE) || - (argc == 3 && zend_get_parameters_ex(3, &string, &from, &len) == FAILURE) || + if ((argc == 2 && zend_get_parameters_ex(2, &str, &from) == FAILURE) || + (argc == 3 && zend_get_parameters_ex(3, &str, &from, &len) == FAILURE) || argc < 2 || argc > 3) { WRONG_PARAM_COUNT; } - convert_to_string_ex(string); + convert_to_string_ex(str); convert_to_long_ex(from); f = (*from)->value.lval; if (argc == 2) { - l = (*string)->value.str.len; + l = (*str)->value.str.len; } else { convert_to_long_ex(len); l = (*len)->value.lval; @@ -884,7 +884,7 @@ * of the string */ if (f < 0) { - f = (*string)->value.str.len + f; + f = (*str)->value.str.len + f; if (f < 0) { f = 0; } @@ -894,21 +894,21 @@ * needed to stop that many chars from the end of the string */ if (l < 0) { - l = ((*string)->value.str.len - f) + l; + l = ((*str)->value.str.len - f) + l; if (l < 0) { l = 0; } } - if (f >= (int)(*string)->value.str.len) { + if (f >= (int)(*str)->value.str.len) { RETURN_FALSE; } - if((f+l) > (int)(*string)->value.str.len) { - l = (int)(*string)->value.str.len - f; + if((f+l) > (int)(*str)->value.str.len) { + l = (int)(*str)->value.str.len - f; } - RETVAL_STRINGL((*string)->value.str.val + f, l, 1); + RETVAL_STRINGL((*str)->value.str.val + f, l, 1); } /* }}} */ @@ -917,7 +917,7 @@ Replace part of a string with another string */ PHP_FUNCTION(substr_replace) { - zval** string; + zval** str; zval** from; zval** len; zval** repl; @@ -929,19 +929,19 @@ argc = ARG_COUNT(ht); - if ((argc == 3 && zend_get_parameters_ex(3, &string, &repl, &from) == FAILURE) || - (argc == 4 && zend_get_parameters_ex(4, &string, &repl, &from, &len) == FAILURE) || + if ((argc == 3 && zend_get_parameters_ex(3, &str, &repl, &from) == FAILURE) || + (argc == 4 && zend_get_parameters_ex(4, &str, &repl, &from, &len) == FAILURE) || argc < 3 || argc > 4) { WRONG_PARAM_COUNT; } - convert_to_string_ex(string); + convert_to_string_ex(str); convert_to_string_ex(repl); convert_to_long_ex(from); f = (*from)->value.lval; if (argc == 3) { - l = (*string)->value.str.len; + l = (*str)->value.str.len; } else { convert_to_long_ex(len); l = (*len)->value.lval; @@ -951,7 +951,7 @@ * of the string */ if (f < 0) { - f = (*string)->value.str.len + f; + f = (*str)->value.str.len + f; if (f < 0) { f = 0; } @@ -961,27 +961,27 @@ * needed to stop that many chars from the end of the string */ if (l < 0) { - l = ((*string)->value.str.len - f) + l; + l = ((*str)->value.str.len - f) + l; if (l < 0) { l = 0; } } - if (f >= (int)(*string)->value.str.len) { - RETURN_STRINGL((*string)->value.str.val, (*string)->value.str.len, 1); + if (f >= (int)(*str)->value.str.len) { + RETURN_STRINGL((*str)->value.str.val, (*str)->value.str.len, 1); } - if((f+l) > (int)(*string)->value.str.len) { - l = (int)(*string)->value.str.len - f; + if((f+l) > (int)(*str)->value.str.len) { + l = (int)(*str)->value.str.len - f; } - result_len = (*string)->value.str.len - l + (*repl)->value.str.len; + result_len = (*str)->value.str.len - l + (*repl)->value.str.len; result = (char *)ecalloc(result_len + 1, sizeof(char *)); - memcpy(result, (*string)->value.str.val, f); + memcpy(result, (*str)->value.str.val, f); memcpy(&result[f], (*repl)->value.str.val, (*repl)->value.str.len); - memcpy(&result[f + (*repl)->value.str.len], (*string)->value.str.val + f + l, - (*string)->value.str.len - f - l); + memcpy(&result[f + (*repl)->value.str.len], (*str)->value.str.val + f + l, + (*str)->value.str.len - f - l); RETVAL_STRINGL(result, result_len, 0); } @@ -1122,14 +1122,14 @@ } /* }}} */ -PHPAPI char *php_strtr(char *string, int len, char *str_from, +PHPAPI char *php_strtr(char *str, int len, char *str_from, char *str_to, int trlen) { int i; unsigned char xlat[256]; if ((trlen < 1) || (len < 1)) { - return string; + return str; } for (i = 0; i < 256; xlat[i] = i, i++); @@ -1139,10 +1139,10 @@ } for (i = 0; i < len; i++) { - string[i] = xlat[(unsigned char) string[i]]; + str[i] = xlat[(unsigned char) str[i]]; } - return string; + return str; } static void php_strtr_array(zval *return_value,char *str,int slen,HashTable *hash) @@ -1387,7 +1387,7 @@ /* be careful, this edits the string in-place */ -PHPAPI void php_stripslashes(char *string, int *len) +PHPAPI void php_stripslashes(char *str, int *len) { char *s, *t; int l; @@ -1401,10 +1401,10 @@ if (len != NULL) { l = *len; } else { - l = strlen(string); + l = strlen(str); } - s = string; - t = string; + s = str; + t = str; while (l > 0) { if (*t == escape_char) { t++; /* skip the slash */ Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.18 php4/ext/standard/url.c:1.19 --- php4/ext/standard/url.c:1.18 Fri Dec 31 17:31:53 1999 +++ php4/ext/standard/url.c Tue Feb 8 14:21:43 2000 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.18 2000/01/01 01:31:53 sas Exp $ */ +/* $Id: url.c,v 1.19 2000/02/08 22:21:43 zeev Exp $ */ #include <stdlib.h> #include <string.h> @@ -56,12 +56,12 @@ efree(theurl); } -url *url_parse(char *string) +url *url_parse(char *str) { regex_t re; regmatch_t subs[10]; int err; - int length = strlen(string); + int length = strlen(str); char *result; url *ret = (url *) emalloc(sizeof(url)); @@ -79,7 +79,7 @@ efree(ret); return NULL; } - err = regexec(&re, string, 10, subs, 0); + err = regexec(&re, str, 10, subs, 0); if (err) { /*php_error(E_WARNING,"Error with regex\n");*/ efree(ret); @@ -87,28 +87,28 @@ } /* no processing necessary on the scheme */ if (subs[2].rm_so != -1 && subs[2].rm_so < length) { - ret->scheme = estrndup(string + subs[2].rm_so, subs[2].rm_eo - subs[2].rm_so); + ret->scheme = estrndup(str + subs[2].rm_so, subs[2].rm_eo - subs[2].rm_so); } /* the path to the resource */ if (subs[5].rm_so != -1 && subs[5].rm_so < length) { - ret->path = estrndup(string + subs[5].rm_so, subs[5].rm_eo - subs[5].rm_so); + ret->path = estrndup(str + subs[5].rm_so, subs[5].rm_eo - subs[5].rm_so); } /* the query part */ if (subs[7].rm_so != -1 && subs[7].rm_so < length) { - ret->query = estrndup(string + subs[7].rm_so, subs[7].rm_eo - subs[7].rm_so); + ret->query = estrndup(str + subs[7].rm_so, subs[7].rm_eo - subs[7].rm_so); } /* the fragment */ if (subs[9].rm_so != -1 && subs[9].rm_so < length) { - ret->fragment = estrndup(string + subs[9].rm_so, subs[9].rm_eo - subs[9].rm_so); + ret->fragment = estrndup(str + subs[9].rm_so, subs[9].rm_eo - subs[9].rm_so); } /* extract the username, pass, and port from the hostname */ if (subs[4].rm_so != -1 && subs[4].rm_so < length) { /* extract username:pass@host:port from regex results */ - result = estrndup(string + subs[4].rm_so, subs[4].rm_eo - subs[4].rm_so); + result = estrndup(str + subs[4].rm_so, subs[4].rm_eo - subs[4].rm_so); length = strlen(result); regfree(&re); /* free the old regex */ @@ -155,18 +155,18 @@ Parse a URL and return its components */ PHP_FUNCTION(parse_url) { - pval **string; + pval **str; url *resource; - if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &string) == FAILURE) { + if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string_ex(string); + convert_to_string_ex(str); - resource = url_parse((*string)->value.str.val); + resource = url_parse((*str)->value.str.val); if (resource == NULL) { - php_error(E_WARNING, "unable to parse url (%s)", (*string)->value.str.val); + php_error(E_WARNING, "unable to parse url (%s)", (*str)->value.str.val); RETURN_FALSE; } /* allocate an array for return */