Merge branch 'PHP-7.0'

laruence · laruence · commit 8d6d28d9c64d · 2015-12-14T09:23:15.000-08:00
diff --git a/ext/standard/password.c b/ext/standard/password.c
@@ -110,8 +110,7 @@ static int php_password_salt_to64(const char *str, const size_t str_len, const s
 
 static int php_password_make_salt(size_t length, char *ret) /* {{{ */
 {
-	int buffer_valid = 0;
-	size_t i, raw_length;
+	size_t raw_length;
 	char *buffer;
 	char *result;
 

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,7 @@ static int php_password_salt_to64(const char *str, const size_t str_len, const s`
`110`	`110`
`111`	`111`	`static int php_password_make_salt(size_t length, char ret) / {{{ */`
`112`	`112`	`{`
`113`		`- int buffer_valid = 0;`
`114`		`- size_t i, raw_length;`
	`113`	`+ size_t raw_length;`
`115`	`114`	`char *buffer;`
`116`	`115`	`char *result;`
`117`	`116`