From 3e01f5afb1b52fe26a956190296de0192eedeec1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Jan 2021 12:30:54 +0100 Subject: 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. --- Zend/zend_smart_string.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Zend/zend_smart_string.h') diff --git a/Zend/zend_smart_string.h b/Zend/zend_smart_string.h index 1f74a63218..d9f484b91e 100644 --- a/Zend/zend_smart_string.h +++ b/Zend/zend_smart_string.h @@ -51,7 +51,7 @@ ZEND_API void ZEND_FASTCALL _smart_string_alloc_persistent(smart_string *str, size_t len); ZEND_API void ZEND_FASTCALL _smart_string_alloc(smart_string *str, size_t len); -static zend_always_inline size_t smart_string_alloc(smart_string *str, size_t len, zend_bool persistent) { +static zend_always_inline size_t smart_string_alloc(smart_string *str, size_t len, bool persistent) { if (UNEXPECTED(!str->c) || UNEXPECTED(len >= str->a - str->len)) { if (persistent) { _smart_string_alloc_persistent(str, len); @@ -62,7 +62,7 @@ static zend_always_inline size_t smart_string_alloc(smart_string *str, size_t le return str->len + len; } -static zend_always_inline void smart_string_free_ex(smart_string *str, zend_bool persistent) { +static zend_always_inline void smart_string_free_ex(smart_string *str, bool persistent) { if (str->c) { pefree(str->c, persistent); str->c = NULL; @@ -76,25 +76,25 @@ static zend_always_inline void smart_string_0(smart_string *str) { } } -static zend_always_inline void smart_string_appendc_ex(smart_string *dest, char ch, zend_bool persistent) { +static zend_always_inline void smart_string_appendc_ex(smart_string *dest, char ch, bool persistent) { dest->len = smart_string_alloc(dest, 1, persistent); dest->c[dest->len - 1] = ch; } -static zend_always_inline void smart_string_appendl_ex(smart_string *dest, const char *str, size_t len, zend_bool persistent) { +static zend_always_inline void smart_string_appendl_ex(smart_string *dest, const char *str, size_t len, bool persistent) { size_t new_len = smart_string_alloc(dest, len, persistent); memcpy(dest->c + dest->len, str, len); dest->len = new_len; } -static zend_always_inline void smart_string_append_long_ex(smart_string *dest, zend_long num, zend_bool persistent) { +static zend_always_inline void smart_string_append_long_ex(smart_string *dest, zend_long num, bool persistent) { char buf[32]; char *result = zend_print_long_to_buf(buf + sizeof(buf) - 1, num); smart_string_appendl_ex(dest, result, buf + sizeof(buf) - 1 - result, persistent); } -static zend_always_inline void smart_string_append_unsigned_ex(smart_string *dest, zend_ulong num, zend_bool persistent) { +static zend_always_inline void smart_string_append_unsigned_ex(smart_string *dest, zend_ulong num, bool persistent) { char buf[32]; char *result = zend_print_ulong_to_buf(buf + sizeof(buf) - 1, num); smart_string_appendl_ex(dest, result, buf + sizeof(buf) - 1 - result, persistent); -- cgit v1.2.1