diff options
| author | Thies C. Arntzen <thies@php.net> | 1999-06-21 15:57:20 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 1999-06-21 15:57:20 +0000 |
| commit | 80526676840d0861db8bb94fb3a6eaf8c30c8196 (patch) | |
| tree | e8bde847a23bb8abd151a87f8de7384e58111879 /ext/standard | |
| parent | af56b0f936a5c01abc79d4dcd92736d5183e9012 (diff) | |
| download | php-git-80526676840d0861db8bb94fb3a6eaf8c30c8196.tar.gz | |
fixed implode "again" -
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/string.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 1a5aecd3de..e4385724ff 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -309,15 +309,15 @@ PHP_FUNCTION(explode) void _php3_implode(pval *delim, pval *arr, pval *return_value) { - pval *tmp; + pval **tmp; int len = 0, count = 0; /* convert everything to strings, and calculate length */ _php3_hash_internal_pointer_reset(arr->value.ht); while (_php3_hash_get_current_data(arr->value.ht, (void **) &tmp) == SUCCESS) { - convert_to_string(tmp); - if (tmp->type == IS_STRING && tmp->value.str.val != undefined_variable_string) { - len += tmp->value.str.len; + convert_to_string(*tmp); + if ((*tmp)->type == IS_STRING && (*tmp)->value.str.val != undefined_variable_string) { + len += (*tmp)->value.str.len; if (count>0) { len += delim->value.str.len; } @@ -332,9 +332,9 @@ void _php3_implode(pval *delim, pval *arr, pval *return_value) return_value->value.str.val[len] = '\0'; _php3_hash_internal_pointer_reset(arr->value.ht); while (_php3_hash_get_current_data(arr->value.ht, (void **) &tmp) == SUCCESS) { - if (tmp->type == IS_STRING && tmp->value.str.val != undefined_variable_string) { + if ((*tmp)->type == IS_STRING && (*tmp)->value.str.val != undefined_variable_string) { count--; - strcat(return_value->value.str.val, tmp->value.str.val); + strcat(return_value->value.str.val, (*tmp)->value.str.val); if (count > 0) { strcat(return_value->value.str.val, delim->value.str.val); } |