archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/standard/html.c: clean up a bit (GH-16311)

Browse source 
- Instead of manually wrapping `assert()` statements with a `ZEND_DEBUG`
condition, use `ZEND_ASSERT()`, so that for non-debug builds the compiler is
told to assume that the assertion is correct.

- Update some return types for methods that return `zend_result`.
This commit is contained in:
DanielEScherzer 2024-10-10 14:30:03 -07:00 • committed by GitHub
parent c597f92be9
commit 018e7f5842
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/standard/html.c
View file

@ -451,7 +451,7 @@ static inline unsigned char unimap_bsearch(const uni_to_enc *table, unsigned cod
/* }}} */ /* }}} */
/* {{{ map_from_unicode */ /* {{{ map_from_unicode */
static inline int map_from_unicode(unsigned code, enum entity_charset charset, unsigned *res) static inline zend_result map_from_unicode(unsigned code, enum entity_charset charset, unsigned *res)
{ {
unsigned char found; unsigned char found;
const uni_to_enc *table; const uni_to_enc *table;
@ -667,7 +667,7 @@ static inline int numeric_entity_is_allowed(unsigned uni_cp, int document_type)
* On input, *buf should point to the first character after # and on output, it's the last * On input, *buf should point to the first character after # and on output, it's the last
* byte read, no matter if there was success or insuccess. * byte read, no matter if there was success or insuccess.
*/ */
static inline int process_numeric_entity(const char **buf, unsigned *code_point) static inline zend_result process_numeric_entity(const char **buf, unsigned *code_point)
{ {
zend_long code_l; zend_long code_l;
int hexadecimal = (**buf == 'x' || **buf == 'X'); /* TODO: XML apparently disallows "X" */ int hexadecimal = (**buf == 'x' || **buf == 'X'); /* TODO: XML apparently disallows "X" */
@ -703,7 +703,7 @@ static inline int process_numeric_entity(const char **buf, unsigned *code_point)
/* }}} */ /* }}} */
/* {{{ process_named_entity */ /* {{{ process_named_entity */
static inline int process_named_entity_html(const char **buf, const char **start, size_t *length) static inline zend_result process_named_entity_html(const char **buf, const char **start, size_t *length)
{ {
*start = *buf; *start = *buf;
@ -732,7 +732,7 @@ static inline int process_named_entity_html(const char **buf, const char **start
/* }}} */ /* }}} */
/* {{{ resolve_named_entity_html */ /* {{{ resolve_named_entity_html */
static int resolve_named_entity_html(const char *start, size_t length, const entity_ht *ht, unsigned *uni_cp1, unsigned *uni_cp2) static zend_result resolve_named_entity_html(const char *start, size_t length, const entity_ht *ht, unsigned *uni_cp1, unsigned *uni_cp2)
{ {
const entity_cp_map *s; const entity_cp_map *s;
zend_ulong hash = zend_inline_hash_func(start, length); zend_ulong hash = zend_inline_hash_func(start, length);
@ -780,9 +780,7 @@ static inline size_t write_octet_sequence(unsigned char *buf, enum entity_charse
#if 0 #if 0
return php_mb2_int_to_char(buf, code); return php_mb2_int_to_char(buf, code);
#else #else
#if ZEND_DEBUG ZEND_ASSERT(code <= 0xFFU);
assert(code <= 0xFFU);
#endif
*buf = code; *buf = code;
return 1; return 1;
#endif #endif
@ -791,9 +789,7 @@ static inline size_t write_octet_sequence(unsigned char *buf, enum entity_charse
#if 0 /* idem */ #if 0 /* idem */
return php_mb2_int_to_char(buf, code); return php_mb2_int_to_char(buf, code);
#else #else
#if ZEND_DEBUG ZEND_ASSERT(code <= 0xFFU);
assert(code <= 0xFFU);
#endif
*buf = code; *buf = code;
return 1; return 1;
#endif #endif