This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH A1/1]
- From: Richard Henderson <rth at twiddle dot net>
- To: libc-alpha at sourceware dot org
- Cc: roland at hack dot frob dot com
- Date: Fri, 9 Jan 2015 10:16:57 -0800
- Subject: [PATCH A1/1]
- Authentication-results: sourceware.org; auth=none
This is a minimal patch to fix the current -Werrors resulting from
the use of -DNDEBUG on x86_64. Rather than ifdef out the variables,
as we have done elsewhere, it seemed less invasive to simply mark
them as unused so that the compiler wouldn't warn.
r~
* iconv/skeleton (FUNCTION_NAME): Mark nstatus unused.
* nscd/nscd.c (do_exit): Mark ret unused.
(notify_parent): Likewise.
* sysdeps/nptl/gai_misc.h (__gai_start_notify_thread): Mark
sigerr unused.
(__gai_create_helper_thread): Likewise.
---
iconv/skeleton.c | 2 +-
nscd/nscd.c | 6 ++++--
sysdeps/nptl/gai_misc.h | 7 +++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 09dfe11..b1ef9ee 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -675,7 +675,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
#else
/* We have a problem in one of the functions below.
Undo the conversion upto the error point. */
- size_t nstatus;
+ size_t nstatus __attribute__((unused));
/* Reload the pointers. */
*inptrp = inptr;
diff --git a/nscd/nscd.c b/nscd/nscd.c
index 35b3a97..e73d071 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -659,7 +659,8 @@ do_exit (int child_ret, int errnum, const char *format, ...)
{
if (parent_fd != -1)
{
- int ret = write (parent_fd, &child_ret, sizeof (child_ret));
+ int ret __attribute__((unused));
+ ret = write (parent_fd, &child_ret, sizeof (child_ret));
assert (ret == sizeof (child_ret));
close (parent_fd);
}
@@ -691,7 +692,8 @@ notify_parent (int child_ret)
if (parent_fd == -1)
return;
- int ret = write (parent_fd, &child_ret, sizeof (child_ret));
+ int ret __attribute__((unused));
+ ret = write (parent_fd, &child_ret, sizeof (child_ret));
assert (ret == sizeof (child_ret));
close (parent_fd);
parent_fd = -1;
diff --git a/sysdeps/nptl/gai_misc.h b/sysdeps/nptl/gai_misc.h
index bb83dca..b952dc4 100644
--- a/sysdeps/nptl/gai_misc.h
+++ b/sysdeps/nptl/gai_misc.h
@@ -81,7 +81,8 @@ __gai_start_notify_thread (void)
{
sigset_t ss;
sigemptyset (&ss);
- int sigerr = pthread_sigmask (SIG_SETMASK, &ss, NULL);
+ int sigerr __attribute__((unused));
+ sigerr = pthread_sigmask (SIG_SETMASK, &ss, NULL);
assert_perror (sigerr);
}
@@ -105,7 +106,9 @@ __gai_create_helper_thread (pthread_t *threadp, void *(*tf) (void *),
sigset_t ss;
sigset_t oss;
sigfillset (&ss);
- int sigerr = pthread_sigmask (SIG_SETMASK, &ss, &oss);
+ int sigerr __attribute__((unused));
+
+ sigerr = pthread_sigmask (SIG_SETMASK, &ss, &oss);
assert_perror (sigerr);
int ret = pthread_create (threadp, &attr, tf, arg);
--
2.1.0