minor changes / no more compiler warnings

3 files changed, 5 insertions, 5 deletions

diff --git a/execute.c b/execute.c
index 9bcd29c..560d8f5 100644
--- a/execute.c
+++ b/execute.c
@@ -150,7 +150,7 @@ static int suhosin_check_filename(char *s, int len TSRMLS_DC)
                 return SUHOSIN_CODE_TYPE_MANYDOTS;
         }
         
-SDEBUG("xxx %08x %08x",SUHOSIN_G(include_whitelist),SUHOSIN_G(include_blacklist));
+SDEBUG("xxx %p %p",SUHOSIN_G(include_whitelist),SUHOSIN_G(include_blacklist));
         /* no black or whitelist then disallow all */
         if (SUHOSIN_G(include_whitelist)==NULL && SUHOSIN_G(include_blacklist)==NULL) {
                 /* disallow all URLs */
@@ -519,7 +519,7 @@ static void suhosin_execute_ex(zend_op_array *op_array, int zo, long dummy TSRML
         } else {
                 if (suhosin_zend_extension_entry.resource_number != -1) {
                         suhosin_flags = (unsigned long *) &op_array->reserved[suhosin_zend_extension_entry.resource_number];
-                        SDEBUG("suhosin flags: %08x", *suhosin_flags);
+                        SDEBUG("suhosin flags: %08lx", *suhosin_flags);
                         
                         if (*suhosin_flags & SUHOSIN_FLAG_CREATED_BY_EVAL) {
                                 SUHOSIN_G(in_code_type) = SUHOSIN_EVAL;
diff --git a/log.c b/log.c
index 3edc119..6f4a3eb 100644
--- a/log.c
+++ b/log.c
@@ -122,7 +122,7 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...)
         /* remove the S_GETCALLER flag */
         loglevel = loglevel & ~S_GETCALLER;
 
-        SDEBUG("(suhosin_log) loglevel: %d log_syslog: %u - log_sapi: %u - log_script: %u", loglevel, SUHOSIN_G(log_syslog), SUHOSIN_G(log_sapi), SUHOSIN_G(log_script));
+        SDEBUG("(suhosin_log) loglevel: %d log_syslog: %ld - log_sapi: %ld - log_script: %ld", loglevel, SUHOSIN_G(log_syslog), SUHOSIN_G(log_sapi), SUHOSIN_G(log_script));
 
         /* dump core if wanted */
         if (SUHOSIN_G(coredump) && loglevel == S_MEMORY) {
@@ -278,7 +278,7 @@ log_file:
 
 log_sapi:
         /* SAPI Logging activated? */
-        SDEBUG("(suhosin_log) log_syslog: %u - log_sapi: %u - log_script: %u - log_phpscript: %u", SUHOSIN_G(log_syslog), SUHOSIN_G(log_sapi), SUHOSIN_G(log_script), SUHOSIN_G(log_phpscript));
+        SDEBUG("(suhosin_log) log_syslog: %ld - log_sapi: %ld - log_script: %ld - log_phpscript: %ld", SUHOSIN_G(log_syslog), SUHOSIN_G(log_sapi), SUHOSIN_G(log_script), SUHOSIN_G(log_phpscript));
         if (((SUHOSIN_G(log_sapi)|S_INTERNAL) & loglevel)!=0) {
 #if PHP_VERSION_ID < 50400
                 sapi_module.log_message(buf);
diff --git a/session.c b/session.c
index 924469b..a3261c9 100644
--- a/session.c
+++ b/session.c
@@ -1020,7 +1020,7 @@ static PHP_INI_MH(suhosin_OnUpdateSaveHandler)
     int r;
     char *tmp;
 
-    if ((ps_mod_user) && (SUHOSIN_G(s_original_mod) == ps_mod_user) && (strcmp(new_value, "user") == NULL)) {
+    if ((ps_mod_user) && (SUHOSIN_G(s_original_mod) == ps_mod_user) && (strcmp(new_value, "user") == 0)) {
         return SUCCESS;
     }