mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use bool in mbfl_filt_conv_output_hex (rather than int)

Browse Source
This commit is contained in:
Alex Dowad 2021-08-30 16:05:49 +02:00
parent 776296e12f
commit f303fc8a9b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/mbstring/libmbfl/mbfl/mbfl_convert.c
View File

@ -216,12 +216,13 @@ int mbfl_convert_filter_strcat(mbfl_convert_filter *filter, const unsigned char
static int mbfl_filt_conv_output_hex(unsigned int w, mbfl_convert_filter *filter)
{
int nonzero = 0, shift = 28, ret = 0;
bool nonzero = false;
int shift = 28, ret = 0;
while (shift >= 0) {
int n = (w >> shift) & 0xF;
if (n || nonzero) {
nonzero = 1;
nonzero = true;
ret = (*filter->filter_function)(mbfl_hexchar_table[n], filter);
if (ret < 0) {
return ret;
@ -230,8 +231,8 @@ static int mbfl_filt_conv_output_hex(unsigned int w, mbfl_convert_filter *filter
shift -= 4;
}
if (nonzero == 0) {
/* illegal character was zero; no hex digits were output by above loop */
if (!nonzero) {
/* No hex digits were output by above loop */
ret = (*filter->filter_function)('0', filter);
}