diff options
author | Remi Collet <remi@remirepo.net> | 2019-07-18 11:36:52 +0300 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2019-07-18 11:37:02 +0300 |
commit | b4eb158a00ab30c810d7ef6069547a02cad3359b (patch) | |
tree | 7d241b841e5a01f9cdad962453eb079753b22b8e | |
parent | 7d47331bdbfebf4bb75b01990fb218ae0388e45b (diff) |
ulong => zend_ulong for 7.4
-rw-r--r-- | cluster_library.c | 4 | ||||
-rw-r--r-- | library.c | 2 | ||||
-rw-r--r-- | library.h | 2 | ||||
-rw-r--r-- | redis_array.c | 2 | ||||
-rw-r--r-- | redis_array_impl.c | 2 | ||||
-rw-r--r-- | redis_commands.c | 14 |
6 files changed, 13 insertions, 13 deletions
diff --git a/cluster_library.c b/cluster_library.c index fc49e127..7d1e99a2 100644 --- a/cluster_library.c +++ b/cluster_library.c @@ -176,7 +176,7 @@ cluster_multibulk_resp_recursive(RedisSock *sock, size_t elements, /* Return the socket for a slot and slave index */ static RedisSock *cluster_slot_sock(redisCluster *c, unsigned short slot, - ulong slaveidx) + zend_ulong slaveidx) { redisClusterNode *node; @@ -669,7 +669,7 @@ cluster_node_create(redisCluster *c, char *host, size_t host_len, PHP_REDIS_API int cluster_node_add_slave(redisClusterNode *master, redisClusterNode *slave) { - ulong index; + zend_ulong index; // Allocate our slaves hash table if we haven't yet if (!master->slaves) { @@ -754,7 +754,7 @@ int redis_cmd_append_sstr_key(smart_string *str, char *key, size_t len, RedisSoc /* Append an array key to a redis smart string command. This function * handles the boilerplate conditionals around string or integer keys */ -int redis_cmd_append_sstr_arrkey(smart_string *cmd, zend_string *kstr, ulong idx) +int redis_cmd_append_sstr_arrkey(smart_string *cmd, zend_string *kstr, zend_ulong idx) { char *arg, kbuf[128]; int len; @@ -28,7 +28,7 @@ int redis_cmd_append_sstr_i64(smart_string *str, int64_t append); int redis_cmd_append_sstr_dbl(smart_string *str, double value); int redis_cmd_append_sstr_zval(smart_string *str, zval *z, RedisSock *redis_sock); int redis_cmd_append_sstr_key(smart_string *str, char *key, size_t len, RedisSock *redis_sock, short *slot); -int redis_cmd_append_sstr_arrkey(smart_string *cmd, zend_string *kstr, ulong idx); +int redis_cmd_append_sstr_arrkey(smart_string *cmd, zend_string *kstr, zend_ulong idx); PHP_REDIS_API int redis_spprintf(RedisSock *redis_sock, short *slot, char **ret, char *kw, char *fmt, ...); diff --git a/redis_array.c b/redis_array.c index 556d7f06..d64f6b05 100644 --- a/redis_array.c +++ b/redis_array.c @@ -1033,7 +1033,7 @@ PHP_METHOD(RedisArray, mset) char *key, kbuf[40]; int key_len; zend_string **keys, *zkey; - ulong idx; + zend_ulong idx; if ((ra = redis_array_get(getThis())) == NULL) { RETURN_FALSE; diff --git a/redis_array_impl.c b/redis_array_impl.c index 54ae5002..b78cca22 100644 --- a/redis_array_impl.c +++ b/redis_array_impl.c @@ -907,7 +907,7 @@ ra_move_zset(const char *key, int key_len, zval *z_from, zval *z_to, long ttl) { int i, count; HashTable *h_zset_vals; zend_string *zkey; - ulong idx; + zend_ulong idx; /* run ZRANGE key 0 -1 WITHSCORES on source */ ZVAL_STRINGL(&z_fun_zrange, "ZRANGE", 6); diff --git a/redis_commands.c b/redis_commands.c index 9598ebe9..811cc13b 100644 --- a/redis_commands.c +++ b/redis_commands.c @@ -572,7 +572,7 @@ int redis_zrangebyscore_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, size_t key_len, start_len, end_len; zval *z_opt=NULL, *z_ele; zend_string *zkey; - ulong idx; + zend_ulong idx; HashTable *ht_opt; PHPREDIS_NOTUSED(idx); @@ -1329,7 +1329,7 @@ int redis_set_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, if (z_opts && Z_TYPE_P(z_opts) == IS_ARRAY) { HashTable *kt = Z_ARRVAL_P(z_opts); zend_string *zkey; - ulong idx; + zend_ulong idx; zval *v; PHPREDIS_NOTUSED(idx); @@ -1632,7 +1632,7 @@ int redis_hmset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, char *key; int key_free, count; size_t key_len; - ulong idx; + zend_ulong idx; zval *z_arr; HashTable *ht_vals; smart_string cmdstr = {0}; @@ -2723,7 +2723,7 @@ geoStoreType get_georadius_store_type(zend_string *key) { /* Helper function to extract optional arguments for GEORADIUS and GEORADIUSBYMEMBER */ static int get_georadius_opts(HashTable *ht, geoOptions *opts) { - ulong idx; + zend_ulong idx; char *optstr; zend_string *zkey; zval *optval; @@ -3214,7 +3214,7 @@ int redis_xadd_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_fields, *value; zend_long maxlen = 0; zend_bool approx = 0; - ulong idx; + zend_ulong idx; HashTable *ht_fields; int fcount, argc; char *key, *id; @@ -3356,7 +3356,7 @@ append_stream_args(smart_string *cmdstr, HashTable *ht, RedisSock *redis_sock, zend_string *key, *idstr; short oldslot; zval **id; - ulong idx; + zend_ulong idx; /* Append STREAM qualifier */ REDIS_CMD_APPEND_SSTR_STATIC(cmdstr, "STREAMS"); @@ -3619,7 +3619,7 @@ static void get_xclaim_options(zval *z_arr, xclaimOptions *opt) { zend_string *zkey; char *kval; size_t klen; - ulong idx; + zend_ulong idx; zval *zv; PHPREDIS_NOTUSED(idx); |