aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-01-19 12:04:34 -0800
committerPetr Baudis <pasky@ucw.cz>2010-05-12 01:30:07 +0200
commitb0e8ad9e4b224d9b45def4efbc66618361f18448 (patch)
tree289e31a8eb6220718717b327a811d8da5bd6a9f7
parent72fe1ad1520b87137b11c315533594a4e350adea (diff)
downloadglibc-b0e8ad9e4b224d9b45def4efbc66618361f18448.zip
glibc-b0e8ad9e4b224d9b45def4efbc66618361f18448.tar.gz
glibc-b0e8ad9e4b224d9b45def4efbc66618361f18448.tar.bz2
Remove unnecessary returns.
(cherry picked from commit a7bbf3d742b181bdad41e830f6ef72e632e9fc89)
-rw-r--r--ChangeLog5
-rw-r--r--misc/bits/syslog.h6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a45e8ee..ba93d2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-19 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #11194]
+ * misc/bits/syslog.h (syslog, vsyslog): Remove unnecessary return.
+
2010-01-18 Andreas Schwab <schwab@redhat.com>
* elf/dynamic-link.h (elf_get_dynamic_info): Use correct type when
diff --git a/misc/bits/syslog.h b/misc/bits/syslog.h
index 853b30c..5d64d7a 100644
--- a/misc/bits/syslog.h
+++ b/misc/bits/syslog.h
@@ -1,5 +1,5 @@
/* Checking macros for syslog functions.
- Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@ extern void __syslog_chk (int __pri, int __flag, __const char *__fmt, ...)
__extern_always_inline void
syslog (int __pri, __const char *__fmt, ...)
{
- return __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
+ __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
}
#elif !defined __cplusplus
# define syslog(pri, ...) \
@@ -45,6 +45,6 @@ extern void __vsyslog_chk (int __pri, int __flag, __const char *__fmt,
__extern_always_inline void
vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap)
{
- return __vsyslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
+ __vsyslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
}
#endif