GNU C Library master sources branch master updated. glibc-2.20-312-g0f88636

[jsm28 at sourceware dot org]

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  0f88636c09686b1f8e876bfa88b40bacbcae8c11 (commit)
      from  c81e9deba2f73ddc6f62a9d41684824c854366c6 (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=0f88636c09686b1f8e876bfa88b40bacbcae8c11

commit 0f88636c09686b1f8e876bfa88b40bacbcae8c11
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Dec 10 00:44:54 2014 +0000

    Disable -Wdeprecated-declarations for register_printf_function calls in tst-printfsz.c.
    
    This patch uses diagnostic control pragmas to disable warnings in
    stdio-common/tst-printfsz.c for use of the deprecated
    register_printf_function.  Because this test is testing printf_size
    and printf_size_info, and the latter has the interface expected for
    register_printf_function instead of the newer
    register_printf_specifier, it seems correct for this test to use the
    deprecated interface (wrapping printf_size_info in some way to use
    register_printf_specifier would seem an excessive change to what's
    tested).
    
    Tested for x86_64.
    
    	* stdio-common/tst-printfsz.c: Include <libc-internal.h>.
    	(main): Disable -Wdeprecated-declarations around calls to
    	register_printf_function.

diff --git a/ChangeLog b/ChangeLog
index 04804b0..1014ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-12-10  Joseph Myers  <joseph@codesourcery.com>
 
+	* stdio-common/tst-printfsz.c: Include <libc-internal.h>.
+	(main): Disable -Wdeprecated-declarations around calls to
+	register_printf_function.
+
 	* stdio-common/tst-unlockedio.c: Include <libc-internal.h>.
 	(do_test): Disable -Wdiv-by-zero around some calls to
 	fwrite_unlocked and fread_unlocked.
diff --git a/stdio-common/tst-printfsz.c b/stdio-common/tst-printfsz.c
index 5925050..74d67d2 100644
--- a/stdio-common/tst-printfsz.c
+++ b/stdio-common/tst-printfsz.c
@@ -2,6 +2,7 @@
 #include <printf.h>
 #include <stdio.h>
 #include <string.h>
+#include <libc-internal.h>
 
 #define V       12345678.12345678
 
@@ -12,9 +13,15 @@ main (int argc, char *argv[])
   char buf[1024];
   int result = 0;
 
+  /* Testing printf_size_info requires using the deprecated
+     register_printf_function, resulting in warnings
+     "'register_printf_function' is deprecated".  */
+  DIAG_PUSH_NEEDS_COMMENT;
+  DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations");
   /* Register the printf handlers.  */
   register_printf_function ('b', printf_size, printf_size_info);
   register_printf_function ('B', printf_size, printf_size_info);
+  DIAG_POP_NEEDS_COMMENT;
 
 
   sprintf (buf, "%g %b %B %.0b %.0B %.1b %.1B %8.0b %08.0B",

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                   |    4 ++++
 stdio-common/tst-printfsz.c |    7 +++++++
 2 files changed, 11 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources