Fix incompatible types

Jan-E · Sean-Der · commit 4d66e3d4c06b · 2015-09-09T02:40:38.000Z
diff --git a/library.c b/library.c
@@ -1217,7 +1217,7 @@ static void array_zip_values_and_scores(RedisSock *redis_sock, zval *z_tab,
         char *hkey, *hval;
 		zend_string *tablekey;
         int hkey_len;
-        unsigned long idx;
+        zend_ulong idx;
         zval *z_key_p, *z_value_p;
 
         zend_hash_get_current_key(keytable, &tablekey, &idx);
diff --git a/redis.c b/redis.c
@@ -1848,7 +1848,7 @@ generic_mset(INTERNAL_FUNCTION_PARAMETERS, char *kw, ResultCallback fun) {
             zend_string *key_zstr;
             char *val, *key;
             size_t val_len, key_len;
-            unsigned long idx;
+            zend_ulong idx;
             int type;
             zval *z_value_p;
             int val_free, key_free;
diff --git a/redis_array.c b/redis_array.c
@@ -952,7 +952,7 @@ PHP_METHOD(RedisArray, mset)
 	zend_string *key_zstr;
 	unsigned int key_len, free_idx = 0;
 	int type, *key_lens;
-	unsigned long idx;
+	zend_ulong idx;
 
 	/* Multi/exec support */
 	HANDLE_MULTI_EXEC("MSET");
diff --git a/redis_array_impl.c b/redis_array_impl.c
@@ -533,7 +533,7 @@ ra_index_keys(zval *z_pairs, zval *z_redis TSRMLS_DC) {
 	zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(z_pairs), &pos);
 	while ((z_entry_p = zend_hash_get_current_data_ex(Z_ARRVAL_P(z_pairs), &pos)) != NULL) {
 			zend_string *key;
-			unsigned long num_key;
+			zend_ulong num_key;
 			zval z_new;
 
 			switch (zend_hash_get_current_key_ex(Z_ARRVAL_P(z_pairs), &key, &num_key, &pos)) {
@@ -814,7 +814,7 @@ ra_move_zset(const char *key, int key_len, zval *z_from, zval *z_to, long ttl TS
 	HashTable *h_zset_vals;
 	zend_string *val;
 	int i;
-	unsigned long idx;
+	zend_ulong idx;
 
 	/* run ZRANGE key 0 -1 WITHSCORES on source */
 	ZVAL_STRINGL(&z_fun_zrange, "ZRANGE", 6);
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -534,7 +534,7 @@ static int get_key_val_ht(redisCluster *c, HashTable *ht, HashPosition *ptr,
                           clusterKeyValHT *kv TSRMLS_DC)
 {
     zval *z_val;
-    ulong idx;
+    zend_ulong idx;
 	zend_string *key_zstr;
 
     // Grab the key, convert it to a string using provided kbuf buffer if it's
@@ -2038,7 +2038,7 @@ PHP_METHOD(RedisCluster, watch) {
     smart_string cmd = {0};
     zval *z_args;
     int argc = ZEND_NUM_ARGS(), i;
-    ulong slot;
+    zend_ulong slot;
 
     // Disallow in MULTI mode
     if(c->flags->mode == MULTI) {
diff --git a/redis_commands.c b/redis_commands.c
@@ -1223,7 +1223,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);
         int type;
-        unsigned long idx;
+        zend_ulong idx;
         zend_string *k;
         zval *v;
 
@@ -1565,7 +1565,7 @@ int redis_hmset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     char *key;
     int key_free, count, ktype;
     size_t key_len;
-    unsigned long idx;
+    zend_ulong idx;
     zval *z_arr;
     HashTable *ht_vals;
     HashPosition pos;
