From e27516246342082009dcf3212fdf7f57c433e5dd Mon Sep 17 00:00:00 2001 From: brectanus Date: Mon, 13 Aug 2007 17:49:37 +0000 Subject: [PATCH] Quiet "warning: int format, pid_t arg" type warnings. --- CHANGES | 2 ++ apache2/mod_security2.c | 4 ++-- apache2/re_variables.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 9b0008db..92992cf2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ ?? ??? 2007 - 2.5.0-trunk ------------------------- + * Quiet some compiler warnings. + * Added ability to compile without an external API (-DNO_MODSEC_API). * Added "logdata" meta action to allow safe logging of raw transaction data. diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c index 4d2e450c..6c1a3464 100644 --- a/apache2/mod_security2.c +++ b/apache2/mod_security2.c @@ -462,7 +462,7 @@ static int hook_post_config(apr_pool_t *mp, apr_pool_t *mp_log, apr_pool_t *mp_t if (first_time == 0) { ap_log_error(APLOG_MARK, APLOG_NOTICE | APLOG_NOERRNO, 0, s, - "ModSecurity: chroot checkpoint #2 (pid=%i ppid=%i)", getpid(), getppid()); + "ModSecurity: chroot checkpoint #2 (pid=%d ppid=%d)", getpid(), getppid()); if (chdir(chroot_dir) < 0) { ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, s, @@ -491,7 +491,7 @@ static int hook_post_config(apr_pool_t *mp, apr_pool_t *mp_log, apr_pool_t *mp_t "ModSecurity: chroot successful, path=%s", chroot_dir); } else { ap_log_error(APLOG_MARK, APLOG_NOTICE | APLOG_NOERRNO, 0, s, - "ModSecurity: chroot checkpoint #1 (pid=%i ppid=%i)", getpid(), getppid()); + "ModSecurity: chroot checkpoint #1 (pid=%d ppid=%d)", getpid(), getppid()); } } #endif diff --git a/apache2/re_variables.c b/apache2/re_variables.c index 987ebea5..fba59070 100644 --- a/apache2/re_variables.c +++ b/apache2/re_variables.c @@ -1777,7 +1777,7 @@ static int var_script_filename_generate(modsec_rec *msr, msre_var *var, msre_rul static int var_script_gid_generate(modsec_rec *msr, msre_var *var, msre_rule *rule, apr_table_t *vartab, apr_pool_t *mptmp) { - char *value = apr_psprintf(mptmp, "%i", msr->r->finfo.group); + char *value = apr_psprintf(mptmp, "%d", msr->r->finfo.group); return var_simple_generate(var, vartab, mptmp, value); } @@ -1807,7 +1807,7 @@ static int var_script_mode_generate(modsec_rec *msr, msre_var *var, msre_rule *r static int var_script_uid_generate(modsec_rec *msr, msre_var *var, msre_rule *rule, apr_table_t *vartab, apr_pool_t *mptmp) { - char *value = apr_psprintf(mptmp, "%i", msr->r->finfo.user); + char *value = apr_psprintf(mptmp, "%d", msr->r->finfo.user); return var_simple_generate(var, vartab, mptmp, value); }