diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-15 12:30:54 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-15 12:33:06 +0100 |
| commit | 3e01f5afb1b52fe26a956190296de0192eedeec1 (patch) | |
| tree | 77531ec93e3f3cef9891c77b5ca553eb8487f121 /ext/hash/hash.c | |
| parent | e2c8ab7c33ac5328485c43db5080c5bf4911ce38 (diff) | |
| download | php-git-3e01f5afb1b52fe26a956190296de0192eedeec1.tar.gz | |
Replace zend_bool uses with bool
We're starting to see a mix between uses of zend_bool and bool.
Replace all usages with the standard bool type everywhere.
Of course, zend_bool is retained as an alias.
Diffstat (limited to 'ext/hash/hash.c')
| -rw-r--r-- | ext/hash/hash.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 2a68b8387d..216f80687e 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -353,7 +353,7 @@ PHP_HASH_API int php_hash_unserialize(php_hashcontext_object *hash, zend_long ma /* Userspace */ static void php_hash_do_hash( - zval *return_value, zend_string *algo, char *data, size_t data_len, zend_bool raw_output, bool isfilename, HashTable *args + zval *return_value, zend_string *algo, char *data, size_t data_len, bool raw_output, bool isfilename, HashTable *args ) /* {{{ */ { zend_string *digest; const php_hash_ops *ops; @@ -421,7 +421,7 @@ PHP_FUNCTION(hash) zend_string *algo; char *data; size_t data_len; - zend_bool raw_output = 0; + bool raw_output = 0; HashTable *args = NULL; ZEND_PARSE_PARAMETERS_START(2, 4) @@ -443,7 +443,7 @@ PHP_FUNCTION(hash_file) zend_string *algo; char *data; size_t data_len; - zend_bool raw_output = 0; + bool raw_output = 0; HashTable *args = NULL; ZEND_PARSE_PARAMETERS_START(2, 3) @@ -494,7 +494,7 @@ static inline void php_hash_hmac_round(unsigned char *final, const php_hash_ops } static void php_hash_do_hash_hmac( - zval *return_value, zend_string *algo, char *data, size_t data_len, char *key, size_t key_len, zend_bool raw_output, bool isfilename + zval *return_value, zend_string *algo, char *data, size_t data_len, char *key, size_t key_len, bool raw_output, bool isfilename ) /* {{{ */ { zend_string *digest; unsigned char *K; @@ -578,7 +578,7 @@ PHP_FUNCTION(hash_hmac) zend_string *algo; char *data, *key; size_t data_len, key_len; - zend_bool raw_output = 0; + bool raw_output = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Sss|b", &algo, &data, &data_len, &key, &key_len, &raw_output) == FAILURE) { RETURN_THROWS(); @@ -595,7 +595,7 @@ PHP_FUNCTION(hash_hmac_file) zend_string *algo; char *data, *key; size_t data_len, key_len; - zend_bool raw_output = 0; + bool raw_output = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Sss|b", &algo, &data, &data_len, &key, &key_len, &raw_output) == FAILURE) { RETURN_THROWS(); @@ -777,7 +777,7 @@ PHP_FUNCTION(hash_final) { zval *zhash; php_hashcontext_object *hash; - zend_bool raw_output = 0; + bool raw_output = 0; zend_string *digest; size_t digest_len; @@ -986,7 +986,7 @@ PHP_FUNCTION(hash_pbkdf2) unsigned char *computed_salt, *digest, *temp, *result, *K1, *K2 = NULL; zend_long loops, i, j, iterations, digest_length = 0, length = 0; size_t pass_len, salt_len = 0; - zend_bool raw_output = 0; + bool raw_output = 0; const php_hash_ops *ops; void *context; HashTable *args; |
