diff options
| author | jvoisin | 2017-10-13 14:38:30 +0200 |
|---|---|---|
| committer | jvoisin | 2017-10-13 14:38:30 +0200 |
| commit | e8c0d1a35ac0b0f5c6b72740f25107b01ac13008 (patch) | |
| tree | 0045cbd66e7854d9c59cd66faf02abaebd0ab97f /src | |
| parent | d8ac16389f12bfa5217ad3f0088d7060da280b42 (diff) | |
Fix some pedantic warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp_disabled_functions.c | 2 | ||||
| -rw-r--r-- | src/sp_execute.c | 2 | ||||
| -rw-r--r-- | src/sp_upload_validation.c | 2 | ||||
| -rw-r--r-- | src/sp_utils.c | 2 | ||||
| -rw-r--r-- | src/sp_utils.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c index 4ddb4af..758978c 100644 --- a/src/sp_disabled_functions.c +++ b/src/sp_disabled_functions.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include "zend_execute.h" | 3 | #include "zend_execute.h" |
| 4 | #include "zend_hash.h" | 4 | #include "zend_hash.h" |
| 5 | 5 | ||
| 6 | ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus); | 6 | ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) |
| 7 | 7 | ||
| 8 | static zend_always_inline char* get_complete_function_path( | 8 | static zend_always_inline char* get_complete_function_path( |
| 9 | zend_execute_data const* const execute_data) { | 9 | zend_execute_data const* const execute_data) { |
diff --git a/src/sp_execute.c b/src/sp_execute.c index c8f7acf..bfe73c1 100644 --- a/src/sp_execute.c +++ b/src/sp_execute.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include <errno.h> | 3 | #include <errno.h> |
| 4 | #include <string.h> | 4 | #include <string.h> |
| 5 | 5 | ||
| 6 | ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus); | 6 | ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) |
| 7 | 7 | ||
| 8 | static void (*orig_execute_ex)(zend_execute_data *execute_data); | 8 | static void (*orig_execute_ex)(zend_execute_data *execute_data); |
| 9 | static int (*orig_zend_stream_open)(const char *filename, | 9 | static int (*orig_zend_stream_open)(const char *filename, |
diff --git a/src/sp_upload_validation.c b/src/sp_upload_validation.c index 3f0d788..f3f8af4 100644 --- a/src/sp_upload_validation.c +++ b/src/sp_upload_validation.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #include "php_snuffleupagus.h" | 1 | #include "php_snuffleupagus.h" |
| 2 | #include "rfc1867.h" | 2 | #include "rfc1867.h" |
| 3 | 3 | ||
| 4 | ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus); | 4 | ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) |
| 5 | 5 | ||
| 6 | #define EFREE_3(env) \ | 6 | #define EFREE_3(env) \ |
| 7 | for (size_t i = 0; i < 4; i++) { \ | 7 | for (size_t i = 0; i < 4; i++) { \ |
diff --git a/src/sp_utils.c b/src/sp_utils.c index faf2e9a..6b40e99 100644 --- a/src/sp_utils.c +++ b/src/sp_utils.c | |||
| @@ -30,7 +30,7 @@ void sp_log_msg(char const *feature, char const *level, const char* fmt, ...) { | |||
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | zend_always_inline char* sp_getenv(char* var) { | 33 | zend_always_inline char* sp_getenv(const char* var) { |
| 34 | if (sapi_module.getenv) { | 34 | if (sapi_module.getenv) { |
| 35 | return sapi_module.getenv(ZEND_STRL(var)); | 35 | return sapi_module.getenv(ZEND_STRL(var)); |
| 36 | } else { | 36 | } else { |
diff --git a/src/sp_utils.h b/src/sp_utils.h index 61a4c53..5b22e8a 100644 --- a/src/sp_utils.h +++ b/src/sp_utils.h | |||
| @@ -58,7 +58,7 @@ void sp_log_disable(const char *restrict, const char *restrict, | |||
| 58 | const char *restrict, const sp_disabled_function *); | 58 | const char *restrict, const sp_disabled_function *); |
| 59 | void sp_log_disable_ret(const char *restrict, const char *restrict, | 59 | void sp_log_disable_ret(const char *restrict, const char *restrict, |
| 60 | const sp_disabled_function *); | 60 | const sp_disabled_function *); |
| 61 | char *sp_getenv(char *); | 61 | char *sp_getenv(const char *); |
| 62 | int is_regexp_matching(const pcre *, const char *); | 62 | int is_regexp_matching(const pcre *, const char *); |
| 63 | int hook_function(const char *, HashTable *, | 63 | int hook_function(const char *, HashTable *, |
| 64 | void (*)(INTERNAL_FUNCTION_PARAMETERS), bool); | 64 | void (*)(INTERNAL_FUNCTION_PARAMETERS), bool); |
