Change string->str where possible; string is basic a C++ class, so gdb can't look

inside variables named 'string'.

10 files changed, 109 insertions, 109 deletions

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index f6300ed808..83be893e9f 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1591,7 +1591,7 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 	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 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 	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 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 	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 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 			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 @@ void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	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 @@ void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	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);
diff --git a/ext/gd/gdttf.c b/ext/gd/gdttf.c
index 733800ab0d..47f36e653c 100644
--- a/ext/gd/gdttf.c
+++ b/ext/gd/gdttf.c
@@ -719,7 +719,7 @@ gdttfchar(gdImage *im, int fg, font_t *font,
 
 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 @@ gdttf(gdImage *im, int *brect, int fg, char *fontname,
 	cos_a = font->cos_a;
 	advance_x = advance_y = 0;
 
-	next=string;
+	next=str;
 	while (*next) {	  
 		ch = *next;
 
diff --git a/ext/gd/gdttf.h b/ext/gd/gdttf.h
index 86a5eca1fe..8c533e6d91 100644
--- a/ext/gd/gdttf.h
+++ b/ext/gd/gdttf.h
@@ -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);
 
diff --git a/ext/imap/imap.c b/ext/imap/imap.c
index 9962f18dd7..447fb7a514 100644
--- a/ext/imap/imap.c
+++ b/ext/imap/imap.c
@@ -73,7 +73,7 @@ MAILSTREAM DEFAULTPROTO;
    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 @@ PHP_FUNCTION(imap_rfc822_write_address)
    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 @@ PHP_FUNCTION(imap_rfc822_parse_adrlist)
    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 @@ PHP_FUNCTION(imap_utf8)
 	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 @@ void mm_flags (MAILSTREAM *stream,unsigned long number)
 
 
 /* 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 @@ void mm_notify (MAILSTREAM *stream,char *string, long errflg)
       }
       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 @@ void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status)
 #endif
 }
 
-void mm_log (char *string,long errflg)
+void mm_log (char *str,long errflg)
 {
   ERRORLIST *cur = NIL;
   
@@ -3879,7 +3879,7 @@ void mm_log (char *string,long errflg)
   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 @@ void mm_log (char *string,long errflg)
       }
       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 @@ long mm_diskerror (MAILSTREAM *stream,long errcode,long serious)
 }
 
 
-void mm_fatal (char *string)
+void mm_fatal (char *str)
 {
 }
 
diff --git a/ext/pcre/pcrelib/pcreposix.c b/ext/pcre/pcrelib/pcreposix.c
index 9672be4fd6..3c56d63c68 100644
--- a/ext/pcre/pcrelib/pcreposix.c
+++ b/ext/pcre/pcrelib/pcreposix.c
@@ -212,7 +212,7 @@ return 0;
 *************************************************/
 
 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 @@ if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
 
 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 */
diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c
index e18acc7dd6..fd8731b778 100644
--- a/ext/snmp/winsnmp.c
+++ b/ext/snmp/winsnmp.c
@@ -116,13 +116,13 @@ void _php3_snmp(INTERNAL_FUNCTION_PARAMETERS, int st) {
             } 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 @@ void _php3_snmp(INTERNAL_FUNCTION_PARAMETERS, int st) {
                 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);
diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index 0e0192ca16..cce691f0bf 100644
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -31,8 +31,8 @@ static char base64_table[] =
 	};
 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 @@ unsigned char *php_base64_encode(const unsigned char *string, int length, int *r
 }
 
 /* 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 @@ unsigned char *php_base64_decode(const unsigned char *string, int length, int *r
 /* {{{ 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 @@ PHP_FUNCTION(base64_encode) {
 /* {{{ 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;
diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index fe4fcc5bcb..74f0b899d8 100644
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -85,11 +85,11 @@ PHP_FUNCTION(substr_replace);
 
 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,
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 30a54d73b0..a9f767a82c 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -858,23 +858,23 @@ PHP_FUNCTION(chunk_split)
    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 @@ PHP_FUNCTION(substr)
 	 * 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 @@ PHP_FUNCTION(substr)
 	 * 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 @@ PHP_FUNCTION(substr)
    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 @@ PHP_FUNCTION(substr_replace)
 	
 	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 @@ PHP_FUNCTION(substr_replace)
 	 * 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 @@ PHP_FUNCTION(substr_replace)
 	 * 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 @@ PHP_FUNCTION(ucwords)
 }
 /* }}} */
 
-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 @@ PHPAPI char *php_strtr(char *string, int len, char *str_from,
 	}
 
 	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 @@ PHP_FUNCTION(similar_text)
 	
 
 /* 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 @@ PHPAPI void php_stripslashes(char *string, int *len)
 	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 */
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 1f68159dfa..f37500f984 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -56,12 +56,12 @@ void free_url(url * theurl)
 	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 @@ url *url_parse(char *string)
 		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 @@ url *url_parse(char *string)
 	}
 	/* 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 @@ url *url_parse(char *string)
    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 */