com php-src: RETURN_STRINGL takes only two variables : ext/hash/hash_md.c ext/hash/hash_sha.c
| From: | Lior Kaplan | Date: | Tue, 22 Jul 2014 16:38:35 +0000 |
| Subject: | com php-src: RETURN_STRINGL takes only two variables : ext/hash/hash_md.c ext/hash/hash_sha.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79556@lists.php.net to get a copy of this message | ||
Commit: da81873a462726f7aa67b7522e6e5a06f690d359
Author: Lior Kaplan <kaplanlior@gmail.com> Tue, 22 Jul 2014 05:28:26 +0300
Parents: f163f625e804a5e9bd8fe19be4f8552671b2c12b
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da81873a462726f7aa67b7522e6e5a06f690d359
Log:
RETURN_STRINGL takes only two variables
Follow up for commit f4cfaf36
Changed paths:
M ext/hash/hash_md.c
M ext/hash/hash_sha.c
Diff:
diff --git a/ext/hash/hash_md.c b/ext/hash/hash_md.c
index f13f594..41b2d1a 100644
--- a/ext/hash/hash_md.c
+++ b/ext/hash/hash_md.c
@@ -121,7 +121,7 @@ PHP_NAMED_FUNCTION(php_if_md5)
PHP_MD5Update(&context, arg, arg_len);
PHP_MD5Final(digest, &context);
if (raw_output) {
- RETURN_STRINGL(digest, 16, 1);
+ RETURN_STRINGL(digest, 16);
} else {
make_digest(md5str, digest);
RETVAL_STRING(md5str, 1);
@@ -168,7 +168,7 @@ PHP_NAMED_FUNCTION(php_if_md5_file)
}
if (raw_output) {
- RETURN_STRINGL(digest, 16, 1);
+ RETURN_STRINGL(digest, 16);
} else {
make_digest(md5str, digest);
RETVAL_STRING(md5str, 1);
diff --git a/ext/hash/hash_sha.c b/ext/hash/hash_sha.c
index a784c10..5dfde8b 100644
--- a/ext/hash/hash_sha.c
+++ b/ext/hash/hash_sha.c
@@ -104,7 +104,7 @@ PHP_FUNCTION(sha1)
PHP_SHA1Update(&context, arg, arg_len);
PHP_SHA1Final(digest, &context);
if (raw_output) {
- RETURN_STRINGL(digest, 20, 1);
+ RETURN_STRINGL(digest, 20);
} else {
make_sha1_digest(sha1str, digest);
RETVAL_STRING(sha1str, 1);
@@ -152,7 +152,7 @@ PHP_FUNCTION(sha1_file)
}
if (raw_output) {
- RETURN_STRINGL(digest, 20, 1);
+ RETURN_STRINGL(digest, 20);
} else {
make_sha1_digest(sha1str, digest);
RETVAL_STRING(sha1str, 1);