diff --git a/Zend/zend_property_hooks.c b/Zend/zend_property_hooks.c index 01a8afb169373..fea40c75cd335 100644 --- a/Zend/zend_property_hooks.c +++ b/Zend/zend_property_hooks.c @@ -24,9 +24,9 @@ typedef struct { zend_object_iterator it; + zval declared_props; bool by_ref; bool declared_props_done; - zval declared_props; bool dynamic_props_done; uint32_t dynamic_prop_offset; uint32_t dynamic_prop_it; diff --git a/ext/dom/lexbor/lexbor/css/property.h b/ext/dom/lexbor/lexbor/css/property.h index fb02c2e93440f..d4f052eba15be 100644 --- a/ext/dom/lexbor/lexbor/css/property.h +++ b/ext/dom/lexbor/lexbor/css/property.h @@ -228,8 +228,8 @@ typedef struct { lxb_css_property_float_reference_t; typedef struct { - lxb_css_float_type_t type; lxb_css_value_length_type_t length; + lxb_css_float_type_t type; lxb_css_float_type_t snap_type; } lxb_css_property_float_t; diff --git a/ext/dom/lexbor/lexbor/css/selectors/pseudo.h b/ext/dom/lexbor/lexbor/css/selectors/pseudo.h index 13eef4c847b49..f4600a5405a5b 100644 --- a/ext/dom/lexbor/lexbor/css/selectors/pseudo.h +++ b/ext/dom/lexbor/lexbor/css/selectors/pseudo.h @@ -20,9 +20,9 @@ typedef struct { lxb_char_t *name; size_t length; unsigned id; - bool empty; lxb_css_selector_combinator_t combinator; const lxb_css_syntax_cb_function_t cb; + bool empty; bool forgiving; bool comma; } diff --git a/ext/dom/lexbor/lexbor/css/selectors/pseudo_res.h b/ext/dom/lexbor/lexbor/css/selectors/pseudo_res.h index 5ae6e048064cc..a68ba958fd759 100644 --- a/ext/dom/lexbor/lexbor/css/selectors/pseudo_res.h +++ b/ext/dom/lexbor/lexbor/css/selectors/pseudo_res.h @@ -67,61 +67,61 @@ static const lxb_css_selectors_pseudo_data_t lxb_css_selectors_pseudo_data_pseud static const lxb_css_selectors_pseudo_data_func_t lxb_css_selectors_pseudo_data_pseudo_class_function[LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION__LAST_ENTRY] = { {(lxb_char_t *) "#undef", 6, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION__UNDEF, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function__undef, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, false}, {(lxb_char_t *) "current", 7, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_CURRENT, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_current, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, true}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, true}, {(lxb_char_t *) "dir", 3, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_DIR, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_dir, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, false}, {(lxb_char_t *) "has", 3, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_HAS, - false, LXB_CSS_SELECTOR_COMBINATOR_DESCENDANT, + LXB_CSS_SELECTOR_COMBINATOR_DESCENDANT, {.state = lxb_css_selectors_state_pseudo_class_function_has, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_forgiving_relative}, true, true}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_forgiving_relative}, false, true, true}, {(lxb_char_t *) "is", 2, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_IS, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_is, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_forgiving}, true, true}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_forgiving}, false, true, true}, {(lxb_char_t *) "lang", 4, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_LANG, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_lang, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, false}, {(lxb_char_t *) "not", 3, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_NOT, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_not, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, true}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, true}, {(lxb_char_t *) "nth-child", 9, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_NTH_CHILD, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_nth_child, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, true}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, true}, {(lxb_char_t *) "nth-col", 7, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_NTH_COL, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_nth_col, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, false}, {(lxb_char_t *) "nth-last-child", 14, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_NTH_LAST_CHILD, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_nth_last_child, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, true}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, true}, {(lxb_char_t *) "nth-last-col", 12, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_NTH_LAST_COL, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_nth_last_col, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, false}, {(lxb_char_t *) "nth-last-of-type", 16, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_NTH_LAST_OF_TYPE, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_nth_last_of_type, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, false}, {(lxb_char_t *) "nth-of-type", 11, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_NTH_OF_TYPE, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_nth_of_type, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false}, + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, false}, {(lxb_char_t *) "where", 5, LXB_CSS_SELECTOR_PSEUDO_CLASS_FUNCTION_WHERE, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_class_function_where, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_forgiving}, true, true} + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_forgiving}, false, true, true} }; static const lxb_css_selectors_pseudo_data_t lxb_css_selectors_pseudo_data_pseudo_element[LXB_CSS_SELECTOR_PSEUDO_ELEMENT__LAST_ENTRY] = @@ -144,9 +144,9 @@ static const lxb_css_selectors_pseudo_data_t lxb_css_selectors_pseudo_data_pseud static const lxb_css_selectors_pseudo_data_func_t lxb_css_selectors_pseudo_data_pseudo_element_function[LXB_CSS_SELECTOR_PSEUDO_ELEMENT_FUNCTION__LAST_ENTRY] = { {(lxb_char_t *) "#undef", 6, LXB_CSS_SELECTOR_PSEUDO_ELEMENT_FUNCTION__UNDEF, - false, LXB_CSS_SELECTOR_COMBINATOR_CLOSE, + LXB_CSS_SELECTOR_COMBINATOR_CLOSE, {.state = lxb_css_selectors_state_pseudo_element_function__undef, .block = NULL, - .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false} + .failed = lxb_css_state_failed, .end = lxb_css_selectors_state_function_end}, false, false, false} }; static const lexbor_shs_entry_t lxb_css_selectors_pseudo_class_shs[79] = diff --git a/ext/dom/lexbor/lexbor/css/syntax/token.h b/ext/dom/lexbor/lexbor/css/syntax/token.h index 4adbd265f94d6..2d35e478e9735 100644 --- a/ext/dom/lexbor/lexbor/css/syntax/token.h +++ b/ext/dom/lexbor/lexbor/css/syntax/token.h @@ -190,8 +190,8 @@ struct lxb_css_syntax_token { types; lxb_css_syntax_token_type_t type; - uintptr_t offset; bool cloned; + uintptr_t offset; }; diff --git a/ext/dom/lexbor/lexbor/encoding/base.h b/ext/dom/lexbor/lexbor/encoding/base.h index b3ab42a2ce355..afbadacd47c40 100644 --- a/ext/dom/lexbor/lexbor/encoding/base.h +++ b/ext/dom/lexbor/lexbor/encoding/base.h @@ -94,9 +94,9 @@ lxb_encoding_ctx_euc_jp_t; typedef struct { lxb_char_t lead; lxb_char_t prepand; + bool out_flag; unsigned state; unsigned out_state; - bool out_flag; } lxb_encoding_ctx_2022_jp_t; diff --git a/ext/fileinfo/libmagic/cdf.h b/ext/fileinfo/libmagic/cdf.h index 587bed84d916b..550f7675c80f0 100644 --- a/ext/fileinfo/libmagic/cdf.h +++ b/ext/fileinfo/libmagic/cdf.h @@ -105,10 +105,10 @@ typedef struct { cdf_dirid_t d_storage; uint64_t d_storage_uuid[2]; uint32_t d_flags; + uint32_t d_size; cdf_timestamp_t d_created; cdf_timestamp_t d_modified; cdf_secid_t d_stream_first_sector; - uint32_t d_size; uint32_t d_unused0; } cdf_directory_t; diff --git a/ext/opcache/jit/ir/dynasm/minilua.c b/ext/opcache/jit/ir/dynasm/minilua.c index 68c5591d67947..ce841e086a3f0 100644 --- a/ext/opcache/jit/ir/dynasm/minilua.c +++ b/ext/opcache/jit/ir/dynasm/minilua.c @@ -357,12 +357,12 @@ typedef struct Table{ GCObject*next;lu_byte tt;lu_byte marked; lu_byte flags; lu_byte lsizenode; +int sizearray; struct Table*metatable; TValue*array; Node*node; Node*lastfree; GCObject*gclist; -int sizearray; }Table; #define lmod(s,size)(check_exp((size&(size-1))==0,(cast(int,(s)&((size)-1))))) #define twoto(x)((size_t)1<<(x)) diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h index 41cba0bb35199..faf7cf5b825f9 100644 --- a/ext/opcache/zend_shared_alloc.h +++ b/ext/opcache/zend_shared_alloc.h @@ -104,12 +104,12 @@ typedef struct _zend_smm_shared_globals { zend_shared_segment **shared_segments; /* Number of allocated shared segments */ int shared_segments_count; + /* No more shared memory flag */ + bool memory_exhausted; /* Amount of free shared memory */ size_t shared_free; /* Amount of shared memory allocated by garbage */ size_t wasted_shared_memory; - /* No more shared memory flag */ - bool memory_exhausted; /* Saved Shared Allocator State */ zend_shared_memory_state shared_memory_state; /* Pointer to the application's shared data structures */ diff --git a/main/php_network.h b/main/php_network.h index 94a2508c89e52..246e267e515da 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -314,8 +314,8 @@ END_EXTERN_C() struct _php_netstream_data_t { php_socket_t socket; char is_blocked; - struct timeval timeout; char timeout_event; + struct timeval timeout; size_t ownsize; }; typedef struct _php_netstream_data_t php_netstream_data_t; diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c index 8772850f784f3..8adc1541fdf05 100644 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c @@ -36,14 +36,14 @@ typedef struct { glob_t glob; size_t index; - int flags; char *path; size_t path_len; char *pattern; size_t pattern_len; + int flags; + bool open_basedir_used; size_t *open_basedir_indexmap; size_t open_basedir_indexmap_size; - bool open_basedir_used; } glob_s_t; PHPAPI char* _php_glob_stream_get_path(php_stream *stream, size_t *plen STREAMS_DC) /* {{{ */ diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index e5f6413b060ed..0793d591e962a 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -288,8 +288,8 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg) bool active; int type; int fd; - char *msg; int msglen; + char *msg; } err_buf; /* error buffer */ zend_ulong req_id; /* "request id" to keep track of commands */ diff --git a/sapi/phpdbg/phpdbg_bp.h b/sapi/phpdbg/phpdbg_bp.h index e357b7388e699..3578aafd43d4e 100644 --- a/sapi/phpdbg/phpdbg_bp.h +++ b/sapi/phpdbg/phpdbg_bp.h @@ -38,10 +38,10 @@ typedef struct _zend_op *phpdbg_opline_ptr_t; /* }}} */ /* {{{ breakpoint base structure */ #define phpdbg_breakbase(name) \ - int id; \ uint8_t type; \ - zend_ulong hits; \ bool disabled; \ + int id; \ + zend_ulong hits; \ const char *name /* }}} */ /* {{{ breakpoint base */ @@ -107,9 +107,9 @@ typedef struct _phpdbg_breakop_t { * Breakpoint condition based representation */ typedef struct _phpdbg_breakcond_t { + bool paramed; phpdbg_breakbase(code); size_t code_len; - bool paramed; phpdbg_param_t param; zend_ulong hash; zend_op_array *ops; diff --git a/sapi/phpdbg/phpdbg_cmd.h b/sapi/phpdbg/phpdbg_cmd.h index 95edd073012a3..2c1fabed2773b 100644 --- a/sapi/phpdbg/phpdbg_cmd.h +++ b/sapi/phpdbg/phpdbg_cmd.h @@ -92,11 +92,11 @@ struct _phpdbg_command_t { const char *tip; /* Menu tip */ size_t tip_len; /* Menu tip length */ char alias; /* Alias */ + bool flags; /* General flags */ phpdbg_command_handler_t handler; /* Command handler */ const phpdbg_command_t *subs; /* Sub Commands */ char *args; /* Argument Spec */ const phpdbg_command_t *parent; /* Parent Command */ - bool flags; /* General flags */ }; /* }}} */ @@ -156,13 +156,13 @@ PHPDBG_API void phpdbg_param_debug(const phpdbg_param_t *param, const char *msg) #define PHPDBG_COMMAND_HANDLER(name) phpdbg_do_##name #define PHPDBG_COMMAND_D_EXP(name, tip, alias, handler, children, args, parent, flags) \ - {PHPDBG_STRL(#name), tip, sizeof(tip)-1, alias, phpdbg_do_##handler, children, args, parent, flags} + {PHPDBG_STRL(#name), tip, sizeof(tip)-1, flags, alias, phpdbg_do_##handler, children, args, parent} #define PHPDBG_COMMAND_D_EX(name, tip, alias, handler, children, args, flags) \ - {PHPDBG_STRL(#name), tip, sizeof(tip)-1, alias, phpdbg_do_##handler, children, args, NULL, flags} + {PHPDBG_STRL(#name), tip, sizeof(tip)-1, flags, alias, phpdbg_do_##handler, children, args, NULL} #define PHPDBG_COMMAND_D(name, tip, alias, children, args, flags) \ - {PHPDBG_STRL(#name), tip, sizeof(tip)-1, alias, phpdbg_do_##name, children, args, NULL, flags} + {PHPDBG_STRL(#name), tip, sizeof(tip)-1, flags, alias, phpdbg_do_##name, children, args, NULL} #define PHPDBG_COMMAND(name) int phpdbg_do_##name(const phpdbg_param_t *param) diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c index 1fef964ea74cf..548d835ad2d95 100644 --- a/sapi/phpdbg/phpdbg_help.c +++ b/sapi/phpdbg/phpdbg_help.c @@ -26,7 +26,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) /* {{{ Commands Table */ #define PHPDBG_COMMAND_HELP_D(name, tip, alias, action) \ - {PHPDBG_STRL(#name), tip, sizeof(tip)-1, alias, action, &phpdbg_prompt_commands[16], 0, NULL, (bool) 0} + {PHPDBG_STRL(#name), tip, sizeof(tip)-1, alias, (bool) 0, action, &phpdbg_prompt_commands[16], 0, NULL} const phpdbg_command_t phpdbg_help_commands[] = { PHPDBG_COMMAND_HELP_D(aliases, "show alias list", 'a', phpdbg_do_help_aliases), diff --git a/sapi/phpdbg/phpdbg_lexer.h b/sapi/phpdbg/phpdbg_lexer.h index 439f8cd003c28..176f7c0c181f3 100644 --- a/sapi/phpdbg/phpdbg_lexer.h +++ b/sapi/phpdbg/phpdbg_lexer.h @@ -23,11 +23,11 @@ typedef struct { unsigned int len; + int state; unsigned char *text; unsigned char *cursor; unsigned char *marker; unsigned char *ctxmarker; - int state; } phpdbg_lexer_data; #define yyparse phpdbg_parse