clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Change new -> result. Using C++ keywords isn't too hot

Browse Source
This commit is contained in:
Zeev Suraski 2000-03-26 17:06:19 +00:00
parent 9df63e183e
commit b43f85d641
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ext/standard/string.c
View File

@ -41,22 +41,22 @@ static char hexconvtab[] = "0123456789abcdef";
static char *php_bin2hex(const unsigned char *old, const size_t oldlen, size_t *newlen) static char *php_bin2hex(const unsigned char *old, const size_t oldlen, size_t *newlen)
{ {
unsigned char *new = NULL; unsigned char *result = NULL;
size_t i, j; size_t i, j;
new = (char *) emalloc(oldlen * 2 * sizeof(char)); result = (char *) emalloc(oldlen * 2 * sizeof(char));
if(!new) { if(!result) {
return new; return result;
} }
for(i = j = 0; i < oldlen; i++) { for(i = j = 0; i < oldlen; i++) {
new[j++] = hexconvtab[old[i] >> 4]; result[j++] = hexconvtab[old[i] >> 4];
new[j++] = hexconvtab[old[i] & 15]; result[j++] = hexconvtab[old[i] & 15];
} }
if(newlen) *newlen = oldlen * 2 * sizeof(char); if(newlen) *newlen = oldlen * 2 * sizeof(char);
return new; return result;
} }
/* {{{ proto string bin2hex(string data) /* {{{ proto string bin2hex(string data)
@ -64,7 +64,7 @@ static char *php_bin2hex(const unsigned char *old, const size_t oldlen, size_t *
PHP_FUNCTION(bin2hex) PHP_FUNCTION(bin2hex)
{ {
zval **data; zval **data;
char *new; char *result;
size_t newlen; size_t newlen;
if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &data) == FAILURE) { if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &data) == FAILURE) {
@ -73,13 +73,13 @@ PHP_FUNCTION(bin2hex)
convert_to_string_ex(data); convert_to_string_ex(data);
new = php_bin2hex((*data)->value.str.val, (*data)->value.str.len, &newlen); result = php_bin2hex((*data)->value.str.val, (*data)->value.str.len, &newlen);
if(!new) { if(!result) {
RETURN_FALSE; RETURN_FALSE;
} }
RETURN_STRINGL(new, newlen, 0); RETURN_STRINGL(result, newlen, 0);
} }
/* }}} */ /* }}} */
@ -1746,21 +1746,21 @@ PHPAPI char *php_str_to_str(char *haystack, int length,
char *p, *q; char *p, *q;
char *r, *s; char *r, *s;
char *end = haystack + length; char *end = haystack + length;
char *new; char *result;
char *off; char *off;
new = emalloc(length); result = emalloc(length);
/* we jump through haystack searching for the needle. hurray! */ /* we jump through haystack searching for the needle. hurray! */
for(p = haystack, q = new; for(p = haystack, q = result;
(r = php_memnstr(p, needle, needle_len, end));) { (r = php_memnstr(p, needle, needle_len, end));) {
/* this ain't optimal. you could call it `efficient memory usage' */ /* this ain't optimal. you could call it `efficient memory usage' */
off = erealloc(new, (q - new) + (r - p) + (str_len) + 1); off = erealloc(result, (q - result) + (r - p) + (str_len) + 1);
if(off != new) { if(off != result) {
if(!off) { if(!off) {
goto finish; goto finish;
} }
q += off - new; q += off - result;
new = off; result = off;
} }
memcpy(q, p, r - p); memcpy(q, p, r - p);
q += r - p; q += r - p;
@ -1772,13 +1772,13 @@ PHPAPI char *php_str_to_str(char *haystack, int length,
/* if there is a rest, copy it */ /* if there is a rest, copy it */
if((end - p) > 0) { if((end - p) > 0) {
s = (q) + (end - p); s = (q) + (end - p);
off = erealloc(new, s - new + 1); off = erealloc(result, s - result + 1);
if(off != new) { if(off != result) {
if(!off) { if(!off) {
goto finish; goto finish;
} }
q += off - new; q += off - result;
new = off; result = off;
s = q + (end - p); s = q + (end - p);
} }
memcpy(q, p, end - p); memcpy(q, p, end - p);
@ -1786,8 +1786,8 @@ PHPAPI char *php_str_to_str(char *haystack, int length,
} }
finish: finish:
*q = '\0'; *q = '\0';
if(_new_length) *_new_length = q - new; if(_new_length) *_new_length = q - result;
return new; return result;
} }
@ -1796,7 +1796,7 @@ finish:
PHP_FUNCTION(str_replace) PHP_FUNCTION(str_replace)
{ {
zval **haystack, **needle, **str; zval **haystack, **needle, **str;
char *new; char *result;
int len = 0; int len = 0;
if(ARG_COUNT(ht) != 3 || if(ARG_COUNT(ht) != 3 ||
@ -1827,10 +1827,10 @@ PHP_FUNCTION(str_replace)
RETURN_FALSE; RETURN_FALSE;
} }
new = php_str_to_str((*haystack)->value.str.val, (*haystack)->value.str.len, result = php_str_to_str((*haystack)->value.str.val, (*haystack)->value.str.len,
(*needle)->value.str.val, (*needle)->value.str.len, (*needle)->value.str.val, (*needle)->value.str.len,
(*str)->value.str.val, (*str)->value.str.len, &len); (*str)->value.str.val, (*str)->value.str.len, &len);
RETURN_STRINGL(new, len, 0); RETURN_STRINGL(result, len, 0);
} }
/* }}} */ /* }}} */