diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/snuffleupagus.c | 2 | ||||
| -rw-r--r-- | src/sp_upload_validation.c | 5 | ||||
| -rw-r--r-- | src/sp_utils.c | 2 | ||||
| -rw-r--r-- | src/sp_var_parser.c | 2 | ||||
| -rw-r--r-- | src/tweetnacl.c | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c index 53e610a..e549692 100644 --- a/src/snuffleupagus.c +++ b/src/snuffleupagus.c | |||
| @@ -619,7 +619,7 @@ static PHP_INI_MH(OnUpdateConfiguration) { | |||
| 619 | return SUCCESS; | 619 | return SUCCESS; |
| 620 | } | 620 | } |
| 621 | 621 | ||
| 622 | const zend_function_entry snuffleupagus_functions[] = {PHP_FE_END}; | 622 | static const zend_function_entry snuffleupagus_functions[] = {PHP_FE_END}; |
| 623 | 623 | ||
| 624 | zend_module_entry snuffleupagus_module_entry = { | 624 | zend_module_entry snuffleupagus_module_entry = { |
| 625 | STANDARD_MODULE_HEADER, | 625 | STANDARD_MODULE_HEADER, |
diff --git a/src/sp_upload_validation.c b/src/sp_upload_validation.c index 38b4cb3..6f13249 100644 --- a/src/sp_upload_validation.c +++ b/src/sp_upload_validation.c | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | #include "php_snuffleupagus.h" | 1 | #include "php_snuffleupagus.h" |
| 2 | 2 | ||
| 3 | int (*sp_rfc1867_orig_callback)(unsigned int event, void *event_data, | 3 | static int (*sp_rfc1867_orig_callback)(unsigned int event, void *event_data, |
| 4 | void **extra); | 4 | void **extra); |
| 5 | int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra); | ||
| 6 | 5 | ||
| 7 | #define EFREE_3(env) \ | 6 | #define EFREE_3(env) \ |
| 8 | for (size_t i = 0; i < 4; i++) { \ | 7 | for (size_t i = 0; i < 4; i++) { \ |
| @@ -23,7 +22,7 @@ int sp_rfc1867_callback_win(unsigned int event, void *event_data, | |||
| 23 | 22 | ||
| 24 | #else | 23 | #else |
| 25 | 24 | ||
| 26 | int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra) { | 25 | static int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra) { |
| 27 | int retval = SUCCESS; | 26 | int retval = SUCCESS; |
| 28 | 27 | ||
| 29 | if (sp_rfc1867_orig_callback) { | 28 | if (sp_rfc1867_orig_callback) { |
diff --git a/src/sp_utils.c b/src/sp_utils.c index eeebcc4..82714c5 100644 --- a/src/sp_utils.c +++ b/src/sp_utils.c | |||
| @@ -395,7 +395,7 @@ bool sp_match_array_value(const zval* arr, const zend_string* to_match, const sp | |||
| 395 | return false; | 395 | return false; |
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | bool /* success */ _hook_function(const char* original_name, HashTable* hook_table, zif_handler new_function) { | 398 | static bool /* success */ _hook_function(const char* original_name, HashTable* hook_table, zif_handler new_function) { |
| 399 | zend_function* func; | 399 | zend_function* func; |
| 400 | if ((func = zend_hash_str_find_ptr(CG(function_table), VAR_AND_LEN(original_name)))) { | 400 | if ((func = zend_hash_str_find_ptr(CG(function_table), VAR_AND_LEN(original_name)))) { |
| 401 | if (func->type != ZEND_INTERNAL_FUNCTION) { | 401 | if (func->type != ZEND_INTERNAL_FUNCTION) { |
diff --git a/src/sp_var_parser.c b/src/sp_var_parser.c index 81d696f..c7562f3 100644 --- a/src/sp_var_parser.c +++ b/src/sp_var_parser.c | |||
| @@ -100,7 +100,7 @@ err: | |||
| 100 | return err; | 100 | return err; |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | int cmp_tokens(sp_list_node const *const list1, | 103 | static int cmp_tokens(sp_list_node const *const list1, |
| 104 | sp_list_node const *const list2) { | 104 | sp_list_node const *const list2) { |
| 105 | return (((sp_conf_token *)list1->data)->pos - | 105 | return (((sp_conf_token *)list1->data)->pos - |
| 106 | ((sp_conf_token *)list2->data)->pos); | 106 | ((sp_conf_token *)list2->data)->pos); |
diff --git a/src/tweetnacl.c b/src/tweetnacl.c index 9f66546..746cabc 100644 --- a/src/tweetnacl.c +++ b/src/tweetnacl.c | |||
| @@ -3,7 +3,7 @@ we're using the one from PHP.*/ | |||
| 3 | #include "php_snuffleupagus.h" | 3 | #include "php_snuffleupagus.h" |
| 4 | #include "ext/standard/php_random.h" | 4 | #include "ext/standard/php_random.h" |
| 5 | 5 | ||
| 6 | void randombytes(unsigned char *x, unsigned long long xlen) { | 6 | static void randombytes(unsigned char *x, unsigned long long xlen) { |
| 7 | assert(SIZE_MAX >= ULLONG_MAX); // max(size_t) > max(ull) ? | 7 | assert(SIZE_MAX >= ULLONG_MAX); // max(size_t) > max(ull) ? |
| 8 | php_random_bytes(x, xlen, 1); | 8 | php_random_bytes(x, xlen, 1); |
| 9 | } | 9 | } |
