This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-671-gf2b3078
- From: msebor at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Jan 2016 18:08:37 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-671-gf2b3078
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via f2b3078e6a20211233d4971653838e06d048296a (commit)
from ad37480c4b79b801b987f5529d036b4e25cac615 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f2b3078e6a20211233d4971653838e06d048296a
commit f2b3078e6a20211233d4971653838e06d048296a
Author: Martin Sebor <msebor@redhat.com>
Date: Fri Jan 15 11:07:41 2016 -0700
Fix build failures with -DDEBUG.
[BZ #19443]
* crypt/crypt_util.c [DEBUG] (_ufc_prbits): Correct format string.
[DEBUG] (_ufc_set_bits): Declare used.
* iconv/gconv_dl.c [DEBUG]: Add a missing include directive.
[DEBUG] (print_all): Declare used.
* resolv/res_send.c [DEBUG] (__libc_res_nsend): Explicitly convert
operands of the ternary ?: expression to target type.
* stdlib/rshift.c [DEBUG] (mpn_rshift): Use assert() instead of
calling the undeclared abort.
* time/mktime.c [DEBUG] (DEBUG): Rename to DEBUG_MKTIME.
diff --git a/ChangeLog b/ChangeLog
index 18dd421..a9d575f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2016-01-15 Martin Sebor <msebor@redhat.com>
+ [BZ #19443]
+ * crypt/crypt_util.c [DEBUG] (_ufc_prbits): Correct format string.
+ [DEBUG] (_ufc_set_bits): Declare used.
+ * iconv/gconv_dl.c [DEBUG]: Add a missing include directive.
+ [DEBUG] (print_all): Declare used.
+ * resolv/res_send.c [DEBUG] (__libc_res_nsend): Explicitly convert
+ operands of the ternary ?: expression to target type.
+ * stdlib/rshift.c [DEBUG] (mpn_rshift): Use assert() instead of
+ calling the undeclared abort.
+ * time/mktime.c [DEBUG] (DEBUG): Rename to DEBUG_MKTIME.
+
+2016-01-15 Martin Sebor <msebor@redhat.com>
+
[BZ #18755]
* iconv/skeleton.c (FUNCTION_NAME): Suppress -Wunused-but-set-variable
warnings.
diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c
index 4b6490e..1f42f59 100644
--- a/crypt/crypt_util.c
+++ b/crypt/crypt_util.c
@@ -271,12 +271,12 @@ _ufc_prbits (ufc_long *a, int n)
t=8*i+j;
tmp|=(a[t/24] & BITMASK[t % 24])?bytemask[j]:0;
}
- (void)printf("%02x ",tmp);
+ (void)printf("%02lx ", tmp);
}
printf(" ");
}
-static void
+static void __attribute__ ((unused))
_ufc_set_bits (ufc_long v, ufc_long *b)
{
ufc_long i;
diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c
index 86559d3..4e9dfea 100644
--- a/iconv/gconv_dl.c
+++ b/iconv/gconv_dl.c
@@ -219,6 +219,9 @@ libc_freeres_fn (free_mem)
#ifdef DEBUG
+
+#include <stdio.h>
+
static void
do_print (const void *nodep, VISIT value, int level)
{
@@ -231,7 +234,7 @@ do_print (const void *nodep, VISIT value, int level)
obj->name, obj->counter);
}
-static void
+static void __attribute__ ((used))
print_all (void)
{
__twalk (loaded, do_print);
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 3550740..a968b95 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -499,8 +499,8 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
(stdout, ";; Querying server (# %d) address = %s\n",
ns + 1, inet_ntop(nsap->sa_family,
(nsap->sa_family == AF_INET6
- ? &((struct sockaddr_in6 *) nsap)->sin6_addr
- : &((struct sockaddr_in *) nsap)->sin_addr),
+ ? (void *) &((struct sockaddr_in6 *) nsap)->sin6_addr
+ : (void *) &((struct sockaddr_in *) nsap)->sin_addr),
tmpbuf, sizeof (tmpbuf))));
if (__glibc_unlikely (v_circuit)) {
diff --git a/stdlib/rshift.c b/stdlib/rshift.c
index 4cf345c..d76b9c8 100644
--- a/stdlib/rshift.c
+++ b/stdlib/rshift.c
@@ -21,6 +21,8 @@ along with the GNU MP Library; see the file COPYING.LIB. If not, see
#include <gmp.h>
#include "gmp-impl.h"
+#include <assert.h>
+
/* Shift U (pointed to by UP and USIZE limbs long) CNT bits to the right
and store the USIZE least significant limbs of the result at WP.
The bits shifted out to the right are returned.
@@ -40,10 +42,7 @@ mpn_rshift (register mp_ptr wp,
register mp_size_t i;
mp_limb_t retval;
-#ifdef DEBUG
- if (usize == 0 || cnt == 0)
- abort ();
-#endif
+ assert (usize != 0 && cnt != 0);
sh_1 = cnt;
diff --git a/time/mktime.c b/time/mktime.c
index 7d06314..bc7ed56 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -19,7 +19,7 @@
/* Define this to have a standalone program to test this implementation of
mktime. */
-/* #define DEBUG 1 */
+/* #define DEBUG_MKTIME 1 */
#ifndef _LIBC
# include <config.h>
@@ -38,13 +38,13 @@
#include <string.h> /* For the real memcpy prototype. */
-#if defined DEBUG && DEBUG
+#if defined DEBUG_MKTIME && DEBUG_MKTIME
# include <stdio.h>
# include <stdlib.h>
/* Make it work even if the system's libc has its own mktime routine. */
# undef mktime
# define mktime my_mktime
-#endif /* DEBUG */
+#endif /* DEBUG_MKTIME */
/* Some of the code in this file assumes that signed integer overflow
silently wraps around. This assumption can't easily be programmed
@@ -600,7 +600,7 @@ libc_hidden_def (mktime)
libc_hidden_weak (timelocal)
#endif
-#if defined DEBUG && DEBUG
+#if defined DEBUG_MKTIME && DEBUG_MKTIME
static int
not_equal_tm (const struct tm *a, const struct tm *b)
@@ -732,10 +732,10 @@ main (int argc, char **argv)
return status;
}
-#endif /* DEBUG */
+#endif /* DEBUG_MKTIME */
/*
Local Variables:
-compile-command: "gcc -DDEBUG -I. -Wall -W -O2 -g mktime.c -o mktime"
+compile-command: "gcc -DDEBUG_MKTIME -I. -Wall -W -O2 -g mktime.c -o mktime"
End:
*/
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 +++++++++++++
crypt/crypt_util.c | 4 ++--
iconv/gconv_dl.c | 5 ++++-
resolv/res_send.c | 4 ++--
stdlib/rshift.c | 7 +++----
time/mktime.c | 12 ++++++------
6 files changed, 30 insertions(+), 15 deletions(-)
hooks/post-receive
--
GNU C Library master sources