diff options
| author | jvoisin | 2017-12-21 14:03:18 +0100 |
|---|---|---|
| committer | jvoisin | 2017-12-21 14:03:18 +0100 |
| commit | 0d98f51e7dbde4a40c0039910d43ad378eaefa83 (patch) | |
| tree | 78749747bc46c80f85bc2c3cdfb629b331d200f1 /src/sp_execute.c | |
| parent | f91cf7390c060986e51b77990f4e472165b97dad (diff) | |
Rename sp_node_t to sp_list_node
Since we now have sp_list and sp_tree, it makes sense to specify that
nodes are only for lists.
Diffstat (limited to 'src/sp_execute.c')
| -rw-r--r-- | src/sp_execute.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sp_execute.c b/src/sp_execute.c index cd9ee99..2a62fd8 100644 --- a/src/sp_execute.c +++ b/src/sp_execute.c | |||
| @@ -29,7 +29,7 @@ ZEND_COLD static inline void terminate_if_writable(const char *filename) { | |||
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | static void is_builtin_matching(const char * restrict const filename, | 31 | static void is_builtin_matching(const char * restrict const filename, |
| 32 | char* restrict function_name, char* restrict param_name, sp_node_t *config) { | 32 | char* restrict function_name, char* restrict param_name, sp_list_node *config) { |
| 33 | if (!config || !config->data) { | 33 | if (!config || !config->data) { |
| 34 | return; | 34 | return; |
| 35 | } | 35 | } |
| @@ -65,7 +65,7 @@ static void sp_execute_ex(zend_execute_data *execute_data) { | |||
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | if (execute_data->func->op_array.type == ZEND_EVAL_CODE) { | 67 | if (execute_data->func->op_array.type == ZEND_EVAL_CODE) { |
| 68 | sp_node_t* config = SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_eval; | 68 | sp_list_node* config = SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_eval; |
| 69 | char *filename = get_eval_filename((char *)zend_get_executed_filename()); | 69 | char *filename = get_eval_filename((char *)zend_get_executed_filename()); |
| 70 | is_builtin_matching(filename, "eval", NULL, config); | 70 | is_builtin_matching(filename, "eval", NULL, config); |
| 71 | efree(filename); | 71 | efree(filename); |
| @@ -92,7 +92,7 @@ static int sp_stream_open(const char *filename, zend_file_handle *handle) { | |||
| 92 | if (true == SNUFFLEUPAGUS_G(config).config_readonly_exec->enable) { | 92 | if (true == SNUFFLEUPAGUS_G(config).config_readonly_exec->enable) { |
| 93 | terminate_if_writable(filename); | 93 | terminate_if_writable(filename); |
| 94 | } | 94 | } |
| 95 | sp_node_t* config = SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_include; | 95 | sp_list_node* config = SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_include; |
| 96 | switch (data->opline->extended_value) { | 96 | switch (data->opline->extended_value) { |
| 97 | case ZEND_INCLUDE: | 97 | case ZEND_INCLUDE: |
| 98 | is_builtin_matching(filename, "include", "inclusion path", config); | 98 | is_builtin_matching(filename, "include", "inclusion path", config); |
