apc_iterator: use size_t instead of zend_long/int where appropriate

More -Wsign-compare fixes.

Author: MaxKellermann

apc_iterator.c

@@ -210,8 +210,8 @@ static int apc_iterator_check_expiry(apc_cache_t* cache, apc_cache_entry_t *entr
 /* }}} */
 
 /* {{{ apc_iterator_fetch_active */
-static int apc_iterator_fetch_active(apc_iterator_t *iterator) {
-	int count = 0;
+static size_t apc_iterator_fetch_active(apc_iterator_t *iterator) {
+	size_t count = 0;
 	apc_iterator_item_t *item;
 	time_t t = apc_time();
 
@@ -250,8 +250,8 @@ static int apc_iterator_fetch_active(apc_iterator_t *iterator) {
 /* }}} */
 
 /* {{{ apc_iterator_fetch_deleted */
-static int apc_iterator_fetch_deleted(apc_iterator_t *iterator) {
-	int count = 0;
+static size_t apc_iterator_fetch_deleted(apc_iterator_t *iterator) {
+	size_t count = 0;
 	apc_iterator_item_t *item;
 
 	if (!apc_cache_rlock(apc_user_cache)) {
@@ -288,14 +288,13 @@ static int apc_iterator_fetch_deleted(apc_iterator_t *iterator) {
 /* {{{ apc_iterator_totals */
 static void apc_iterator_totals(apc_iterator_t *iterator) {
 	time_t t = apc_time();
-	int i;
 
 	if (!apc_cache_rlock(apc_user_cache)) {
 		return;
 	}
 
 	php_apc_try {
-		for (i=0; i < apc_user_cache->nslots; i++) {
+		for (size_t i=0; i < apc_user_cache->nslots; i++) {
 			apc_cache_entry_t *entry = apc_user_cache->slots[i];
 			while (entry) {
 				if (apc_iterator_check_expiry(apc_user_cache, entry, t)) {
@@ -315,18 +314,13 @@ static void apc_iterator_totals(apc_iterator_t *iterator) {
 }
 /* }}} */
 
-void apc_iterator_obj_init(apc_iterator_t *iterator, zval *search, zend_long format, zend_long chunk_size, zend_long list)
+void apc_iterator_obj_init(apc_iterator_t *iterator, zval *search, zend_long format, size_t chunk_size, zend_long list)
 {
 	if (!APCG(enabled)) {
 		zend_throw_error(NULL, "APC must be enabled to use APCUIterator");
 		return;
 	}
 
-	if (chunk_size < 0) {
-		apc_error("APCUIterator chunk size must be 0 or greater");
-		return;
-	}
-
 	if (format > APC_ITER_ALL) {
 		apc_error("APCUIterator format is invalid");
 		return;
@@ -384,6 +378,11 @@ PHP_METHOD(APCUIterator, __construct) {
 		return;
 	}
 
+	if (chunk_size < 0) {
+		apc_error("APCUIterator chunk size must be 0 or greater");
+		return;
+	}
+
 	apc_iterator_obj_init(iterator, search, format, chunk_size, list);
 }
 

apc_iterator.h

@@ -50,10 +50,10 @@
 typedef struct _apc_iterator_t {
 	short int initialized;   /* sanity check in case __construct failed */
 	zend_long format;             /* format bitmask of the return values ie: key, value, info */
-	int (*fetch)(struct _apc_iterator_t *iterator);
+	size_t (*fetch)(struct _apc_iterator_t *iterator);
 							 /* fetch callback to fetch items from cache slots or lists */
-	zend_long slot_idx;           /* index to the slot array or linked list */
-	zend_long chunk_size;         /* number of entries to pull down per fetch */
+	size_t slot_idx;           /* index to the slot array or linked list */
+	size_t chunk_size;         /* number of entries to pull down per fetch */
 	apc_stack_t *stack;      /* stack of entries pulled from cache */
 	int stack_idx;           /* index into the current stack */
 	pcre_cache_entry *pce;     /* regex filter on entry identifiers */
@@ -85,7 +85,7 @@ PHP_APCU_API void apc_iterator_obj_init(
 	apc_iterator_t *iterator,
 	zval *search,
 	zend_long format,
-	zend_long chunk_size,
+	size_t chunk_size,
 	zend_long list);
 PHP_APCU_API zend_class_entry* apc_iterator_get_ce(void);
 PHP_APCU_API int apc_iterator_init(int module_number);