ulong => zend_ulong for 7.4

remicollet · remicollet · commit b4eb158a00ab · 2019-07-18T10:37:02.000+02:00
diff --git 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) {
diff --git a/library.c b/library.c
@@ -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;
diff --git a/library.h b/library.h
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ cluster_multibulk_resp_recursive(RedisSock *sock, size_t elements,`
`176`	`176`
`177`	`177`	`/* Return the socket for a slot and slave index */`
`178`	`178`	`static RedisSock cluster_slot_sock(redisCluster c, unsigned short slot,`
`179`		`- ulong slaveidx)`
	`179`	`+ zend_ulong slaveidx)`
`180`	`180`	`{`
`181`	`181`	`redisClusterNode *node;`
`182`	`182`
`@@ -669,7 +669,7 @@ cluster_node_create(redisCluster c, char host, size_t host_len,`
`669`	`669`	`PHP_REDIS_API int`
`670`	`670`	`cluster_node_add_slave(redisClusterNode master, redisClusterNode slave)`
`671`	`671`	`{`
`672`		`- ulong index;`
	`672`	`+ zend_ulong index;`
`673`	`673`
`674`	`674`	`// Allocate our slaves hash table if we haven't yet`
`675`	`675`	`if (!master->slaves) {`
Original file line number	Diff line number	Diff line change
`@@ -754,7 +754,7 @@ int redis_cmd_append_sstr_key(smart_string str, char key, size_t len, RedisSoc`
`754`	`754`
`755`	`755`	`/* Append an array key to a redis smart string command. This function`
`756`	`756`	`* handles the boilerplate conditionals around string or integer keys */`
`757`		`-int redis_cmd_append_sstr_arrkey(smart_string cmd, zend_string kstr, ulong idx)`
	`757`	`+int redis_cmd_append_sstr_arrkey(smart_string cmd, zend_string kstr, zend_ulong idx)`
`758`	`758`	`{`
`759`	`759`	`char *arg, kbuf[128];`
`760`	`760`	`int len;`