diff options
| author | Pavlo Yatsukhnenko <yatsukhnenko@gmail.com> | 2016-09-23 08:51:28 +0300 |
|---|---|---|
| committer | Pavlo Yatsukhnenko <yatsukhnenko@gmail.com> | 2016-09-23 14:09:50 +0300 |
| commit | 377dc5019c97050c90322d42d1215c8d6e7491eb (patch) | |
| tree | 3a114ddeabf08c66e61bc2947c6cbf460cf0904e /redis_commands.c | |
| parent | 5b2220411e807ab0a40712c1384eb8fa8d408933 (diff) | |
WIP: php7 compatibility
Redefine zend_hash_next_index_insert and zend_hash_get_current_data_ex macroses.
Fixed redis cluster crush (#954)
Diffstat (limited to 'redis_commands.c')
| -rw-r--r-- | redis_commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/redis_commands.c b/redis_commands.c index 9eb17fd5..917d1495 100644 --- a/redis_commands.c +++ b/redis_commands.c @@ -1618,12 +1618,12 @@ int redis_hmset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, char *mem, *val, kbuf[40]; int val_len, val_free; unsigned int mem_len; - zval **z_val; + zval *z_val; // Grab our key, and value for this element in our input ktype = zend_hash_get_current_key_ex(ht_vals, &mem, &mem_len, &idx, 0, &pos); - zend_hash_get_current_data_ex(ht_vals, (void**)&z_val, &pos); + z_val = zend_hash_get_current_data_ex(ht_vals, &pos); // If the hash key is an integer, convert it to a string if(ktype != HASH_KEY_IS_STRING) { @@ -1635,7 +1635,7 @@ int redis_hmset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, } // Serialize value (if directed) - val_free = redis_serialize(redis_sock, *z_val, &val, &val_len TSRMLS_CC); + val_free = redis_serialize(redis_sock, z_val, &val, &val_len TSRMLS_CC); // Append the key and value to our command redis_cmd_append_sstr(&cmdstr, mem, mem_len); |