com php-src: Fix issue with int vs long parameter: ext/standard/password.c
| From: | Anthony Ferrara | Date: | Thu, 05 Jul 2012 21:31:40 +0000 |
| Subject: | com php-src: Fix issue with int vs long parameter: ext/standard/password.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70372@lists.php.net to get a copy of this message | ||
Commit: db86d54446c461eab518225645889abc509db034
Author: Anthony Ferrara <ircmaxell@gmail.com> Thu, 5 Jul 2012 17:31:40 -0400
Parents: 5160dc11cd9d0e97eb59138f4639e5af0584f370
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=db86d54446c461eab518225645889abc509db034
Log:
Fix issue with int vs long parameter
Changed paths:
M ext/standard/password.c
Diff:
diff --git a/ext/standard/password.c b/ext/standard/password.c
index 9bfb023..6da656c 100644
--- a/ext/standard/password.c
+++ b/ext/standard/password.c
@@ -266,7 +266,8 @@ Hash a password */
PHP_FUNCTION(password_hash)
{
char *hash_format, *hash, *salt, *password, *result;
- int algo = 0, salt_len = 0, required_salt_len = 0, hash_format_len, password_len;
+ long algo = 0;
+ int salt_len = 0, required_salt_len = 0, hash_format_len, password_len;
HashTable *options = 0;
zval **option_buffer;
@@ -297,7 +298,7 @@ PHP_FUNCTION(password_hash)
}
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown password hashing algorithm: %d",
algo);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown password hashing algorithm: %ld",
algo);
RETURN_NULL();
}