@@ -418,16 +418,16 @@ static php_iconv_err_t _php_iconv_appendc(smart_str *d, const char c, iconv_t cd
418
418
419
419
/* {{{ */
420
420
#ifdef ICONV_BROKEN_IGNORE
421
- static int _php_check_ignore (const char * charset )
421
+ static bool _php_check_ignore (const char * charset )
422
422
{
423
423
size_t clen = strlen (charset );
424
424
if (clen >= 9 && strcmp ("//IGNORE" , charset + clen - 8 ) == 0 ) {
425
- return 1 ;
425
+ return true ;
426
426
}
427
427
if (clen >= 19 && strcmp ("//IGNORE//TRANSLIT" , charset + clen - 18 ) == 0 ) {
428
- return 1 ;
428
+ return true ;
429
429
}
430
- return 0 ;
430
+ return false ;
431
431
}
432
432
#else
433
433
#define _php_check_ignore (x ) (0)
@@ -443,7 +443,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
443
443
size_t bsz , result = 0 ;
444
444
php_iconv_err_t retval = PHP_ICONV_ERR_SUCCESS ;
445
445
zend_string * out_buf ;
446
- int ignore_ilseq = _php_check_ignore (out_charset );
446
+ bool ignore_ilseq = _php_check_ignore (out_charset );
447
447
448
448
* out = NULL ;
449
449
@@ -560,7 +560,7 @@ static php_iconv_err_t _php_iconv_strlen(size_t *pretval, const char *str, size_
560
560
size_t out_left ;
561
561
562
562
size_t cnt ;
563
- int more ;
563
+ bool more ;
564
564
565
565
* pretval = (size_t )-1 ;
566
566
@@ -637,7 +637,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pretval,
637
637
638
638
size_t cnt ;
639
639
size_t total_len ;
640
- int more ;
640
+ bool more ;
641
641
642
642
err = _php_iconv_strlen (& total_len , str , nbytes , enc );
643
643
if (err != PHP_ICONV_ERR_SUCCESS ) {
@@ -775,7 +775,7 @@ static php_iconv_err_t _php_iconv_strpos(size_t *pretval,
775
775
size_t ndl_buf_left ;
776
776
777
777
size_t match_ofs ;
778
- int more ;
778
+ bool more ;
779
779
780
780
* pretval = (size_t )-1 ;
781
781
0 commit comments