Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpredis/phpredis.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlo Yatsukhnenko <yatsukhnenko@gmail.com>2018-12-19 11:16:54 +0300
committerPavlo Yatsukhnenko <yatsukhnenko@gmail.com>2018-12-19 11:16:54 +0300
commit602740d35a5bcbad785ebaff328bfb3ec2ecd36f (patch)
tree8571f0dd08c5f19a1e1061bca2d827b54e4a75aa /redis_array.c
parenteabc5ec79fc8e0d1d43804c063293963c4369384 (diff)
Use zend_string for storing RedisArray hosts
Diffstat (limited to 'redis_array.c')
-rw-r--r--redis_array.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/redis_array.c b/redis_array.c
index 217ab63e..bdb9fd66 100644
--- a/redis_array.c
+++ b/redis_array.c
@@ -141,7 +141,7 @@ redis_array_free(RedisArray *ra)
/* Redis objects */
for(i = 0; i< ra->count; i++) {
zval_dtor(&ra->redis[i]);
- efree(ra->hosts[i]);
+ zend_string_release(ra->hosts[i]);
}
efree(ra->redis);
efree(ra->hosts);
@@ -514,7 +514,7 @@ PHP_METHOD(RedisArray, _hosts)
array_init(return_value);
for(i = 0; i < ra->count; ++i) {
- add_next_index_string(return_value, ra->hosts[i]);
+ add_next_index_stringl(return_value, ZSTR_VAL(ra->hosts[i]), ZSTR_LEN(ra->hosts[i]));
}
}
@@ -538,7 +538,7 @@ PHP_METHOD(RedisArray, _target)
redis_inst = ra_find_node(ra, key, key_len, &i TSRMLS_CC);
if(redis_inst) {
- RETURN_STRING(ra->hosts[i]);
+ RETURN_STRINGL(ZSTR_VAL(ra->hosts[i]), ZSTR_LEN(ra->hosts[i]));
} else {
RETURN_NULL();
}
@@ -646,7 +646,7 @@ multihost_distribute_call(RedisArray *ra, zval *return_value, zval *z_fun, int a
call_user_function(&redis_array_ce->function_table, &ra->redis[i], z_fun, z_tmp, argc, argv);
/* Add the result for this host */
- add_assoc_zval(return_value, ra->hosts[i], z_tmp);
+ add_assoc_zval_ex(return_value, ZSTR_VAL(ra->hosts[i]), ZSTR_LEN(ra->hosts[i]), z_tmp);
}
}