about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--misc/bits/syslog.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a7db139e7b..3fe6844e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* misc/bits/syslog.h (syslog): Remove extraneous argument from
+	the inline, pass __USE_FORTIFY_LEVEL - 1 as second argument to
+	__syslog_chk.
+
 2007-09-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* locale/programs/charmap-dir.c (charmap_aliases): Use %ms instead of
diff --git a/misc/bits/syslog.h b/misc/bits/syslog.h
index f8c81dd9e4..853b30c84a 100644
--- a/misc/bits/syslog.h
+++ b/misc/bits/syslog.h
@@ -27,9 +27,9 @@ extern void __syslog_chk (int __pri, int __flag, __const char *__fmt, ...)
 
 #ifdef __va_arg_pack
 __extern_always_inline void
-syslog (int __pri, int __flag, __const char *__fmt, ...)
+syslog (int __pri, __const char *__fmt, ...)
 {
-  return __syslog_chk (__pri, __flag, __fmt, __va_arg_pack ());
+  return __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
 }
 #elif !defined __cplusplus
 # define syslog(pri, ...) \