From: Rasmus Lerdorf <rasmus@lerdorf.com>
Date: Sat, 21 Mar 2015 06:32:07 +0000 (-0700)
Subject: Fix a couple of warnings
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~568^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d10e15845bfaf0987b5daa02f7fce745b9b287c;p=php

Fix a couple of warnings
---

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 375df46bc9..34b3733d7e 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -956,7 +956,6 @@ static HashTable *php_zip_get_properties(zval *object)/* {{{ */
 	HashTable *props;
 	zip_prop_handler *hnd;
 	zend_string *key;
-	zend_ulong num_key;
 
 	obj = Z_ZIP_P(object);
 	props = zend_std_get_properties(object);
@@ -965,7 +964,7 @@ static HashTable *php_zip_get_properties(zval *object)/* {{{ */
 		return NULL;
 	}
 
-	ZEND_HASH_FOREACH_KEY_PTR(obj->prop_handler, num_key, key, hnd) {
+	ZEND_HASH_FOREACH_STR_KEY_PTR(obj->prop_handler, key, hnd) {
 		zval *ret, val;
 		ret = php_zip_property_reader(obj, hnd, &val);
 		if (ret == NULL) {
@@ -1627,7 +1626,7 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /*
 
 	if (remove_path && remove_path_len > 1) {
 		size_t real_len = strlen(remove_path);
-		if (real_len > 1 && remove_path[real_len - 1] == '/' || remove_path[real_len - 1] == '\\') {
+		if ((real_len > 1) && ((remove_path[real_len - 1] == '/') || (remove_path[real_len - 1] == '\\'))) {
 			remove_path[real_len - 1] = '\0';
 		}
 	}