From e8c0d1a35ac0b0f5c6b72740f25107b01ac13008 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Fri, 13 Oct 2017 14:38:30 +0200
Subject: Fix some pedantic warnings

---
 src/sp_disabled_functions.c | 2 +-
 src/sp_execute.c            | 2 +-
 src/sp_upload_validation.c  | 2 +-
 src/sp_utils.c              | 2 +-
 src/sp_utils.h              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

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 @@
 #include "zend_execute.h"
 #include "zend_hash.h"
 
-ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus);
+ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus)
 
 static zend_always_inline char* get_complete_function_path(
     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 @@
 #include <errno.h>
 #include <string.h>
 
-ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus);
+ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus)
 
 static void (*orig_execute_ex)(zend_execute_data *execute_data);
 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 @@
 #include "php_snuffleupagus.h"
 #include "rfc1867.h"
 
-ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus);
+ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus)
 
 #define EFREE_3(env)               \
   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, ...) {
 }
 
 
-zend_always_inline char* sp_getenv(char* var) {
+zend_always_inline char* sp_getenv(const char* var) {
   if (sapi_module.getenv) {
     return sapi_module.getenv(ZEND_STRL(var));
   } 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,
                     const char *restrict, const sp_disabled_function *);
 void sp_log_disable_ret(const char *restrict, const char *restrict,
                         const sp_disabled_function *);
-char *sp_getenv(char *);
+char *sp_getenv(const char *);
 int is_regexp_matching(const pcre *, const char *);
 int hook_function(const char *, HashTable *,
                   void (*)(INTERNAL_FUNCTION_PARAMETERS), bool);
-- 
cgit v1.3