mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
better alignment + support size_t
This commit is contained in:
parent
830d3d79b3
commit
ca9ab1c993
File diff suppressed because it is too large
Load Diff
@ -81,7 +81,7 @@ static int php_json_ucs2_to_int(php_json_scanner *s, int size)
|
||||
return php_json_ucs2_to_int_ex(s, size, 1);
|
||||
}
|
||||
|
||||
void php_json_scanner_init(php_json_scanner *s, char *str, int str_len, long options)
|
||||
void php_json_scanner_init(php_json_scanner *s, char *str, size_t str_len, int options)
|
||||
{
|
||||
s->cursor = (php_json_ctype *) str;
|
||||
s->limit = (php_json_ctype *) str + str_len;
|
||||
|
@ -32,15 +32,15 @@ typedef struct _php_json_scanner {
|
||||
php_json_ctype *ctxmarker; /* marker position for context backtracking */
|
||||
php_json_ctype *str_start; /* start position of the string */
|
||||
php_json_ctype *pstr; /* string pointer for escapes conversion */
|
||||
zval value; /* value */
|
||||
int str_esc; /* number of extra characters for escaping */
|
||||
int state; /* condition state */
|
||||
zval value; /* value */
|
||||
long options; /* options */
|
||||
int options; /* options */
|
||||
php_json_error_code errcode; /* error type if there is an error */
|
||||
} php_json_scanner;
|
||||
|
||||
|
||||
void php_json_scanner_init(php_json_scanner *scanner, char *str, int str_len, long options);
|
||||
void php_json_scanner_init(php_json_scanner *scanner, char *str, size_t str_len, int options);
|
||||
int php_json_scan(php_json_scanner *s);
|
||||
|
||||
#endif /* PHP_JSON_SCANNER_H */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Generated by re2c 0.13.5 */
|
||||
/* Generated by re2c 0.13.6 */
|
||||
|
||||
enum YYCONDTYPE {
|
||||
yycJS,
|
||||
|
Loading…
Reference in New Issue
Block a user