diff options
| author | Martin Sebor <msebor@redhat.com> | 2016-01-15 10:44:07 -0700 |
|---|---|---|
| committer | Martin Sebor <msebor@redhat.com> | 2016-01-15 10:44:07 -0700 |
| commit | ad37480c4b79b801b987f5529d036b4e25cac615 (patch) | |
| tree | 28121b24f4de02b2b189bbd312cd95cc27b59646 | |
| parent | 09245377dac2c013155500ac0b3b05850813e3f8 (diff) | |
| download | glibc-ad37480c4b79b801b987f5529d036b4e25cac615.tar.gz glibc-ad37480c4b79b801b987f5529d036b4e25cac615.tar.xz glibc-ad37480c4b79b801b987f5529d036b4e25cac615.zip | |
Fix build errors with -DNDEBUG.
[BZ #18755]
* iconv/skeleton.c (FUNCTION_NAME): Suppress -Wunused-but-set-variable
warnings.
* sysdeps/nptl/gai_misc.h (__gai_start_notify_thread): Same.
(__gai_create_helper_thread): Same.
* nscd/nscd.c (do_exit): Suppress -Wunused-variable.
* iconvdata/iso-2022-cn-ext.c (BODY): Initialize local variable
to suppress -Wmaybe-uninitialized warnings.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | iconv/skeleton.c | 2 | ||||
| -rw-r--r-- | iconvdata/iso-2022-cn-ext.c | 2 | ||||
| -rw-r--r-- | nscd/nscd.c | 6 | ||||
| -rw-r--r-- | sysdeps/nptl/gai_misc.h | 6 |
5 files changed, 21 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 8e13d27907..18dd421510 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2016-01-15 Martin Sebor <msebor@redhat.com> + + [BZ #18755] + * iconv/skeleton.c (FUNCTION_NAME): Suppress -Wunused-but-set-variable + warnings. + * sysdeps/nptl/gai_misc.h (__gai_start_notify_thread): Same. + (__gai_create_helper_thread): Same. + * nscd/nscd.c (do_exit): Suppress -Wunused-variable. + * iconvdata/iso-2022-cn-ext.c (BODY): Initialize local variable + to suppress -Wmaybe-uninitialized warnings. + 2016-01-15 H.J. Lu <hongjiu.lu@intel.com> [BZ #19465] diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 084f5b9510..a15f8b1d0b 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/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c index 78f52d729a..df5b5df1fd 100644 --- a/iconvdata/iso-2022-cn-ext.c +++ b/iconvdata/iso-2022-cn-ext.c @@ -426,7 +426,7 @@ enum } \ else \ { \ - unsigned char buf[2]; \ + unsigned char buf[2] = { 0, 0 }; \ int used; \ \ if (set == GB2312_set || ((ann & SO_ann) != CNS11643_1_ann \ diff --git a/nscd/nscd.c b/nscd/nscd.c index 3391915907..bd7c777f09 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 7f26382c8c..c550cdd85e 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,8 @@ __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); |