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.20-293-g909e16d
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Dec 2014 22:49:23 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-293-g909e16d
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 909e16d96064708b43170eeb01135315f540e6ff (commit)
from 4e0b901601038c863b97e68b18ae50a82e10a157 (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=909e16d96064708b43170eeb01135315f540e6ff
commit 909e16d96064708b43170eeb01135315f540e6ff
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Dec 2 22:48:59 2014 +0000
Fix warning in nptl/tst-stack4.c.
This patch fixes a warning in a test that was added since my recent
warning cleanup:
tst-stack4.c: In function 'dso_process':
tst-stack4.c:64:7: warning: format '%i' expects argument of type 'int', but argument 3 has type 'uintptr_t' [-Wformat=]
The original variable has type int then is cast to uintptr_t, and from
there to void *, to pass it to a thread, so reversing the process by
casting to uintptr_t and then to int is natural; this patch does so.
Tested for x86_64.
* nptl/tst-stack4.c (dso_process): Use int not uintptr_t for t.
diff --git a/ChangeLog b/ChangeLog
index 51df3b5..a2c8b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-12-02 Joseph Myers <joseph@codesourcery.com>
+ * nptl/tst-stack4.c (dso_process): Use int not uintptr_t for t.
+
* nptl/tst-mutex1.c: Include <stdbool.h>.
[!ATTR] (ATTR_NULL): New macro.
(do_test): Test !ATTR_NULL instead of ATTR != NULL.
diff --git a/nptl/tst-stack4.c b/nptl/tst-stack4.c
index d9c8df2..3b72693 100644
--- a/nptl/tst-stack4.c
+++ b/nptl/tst-stack4.c
@@ -56,7 +56,7 @@ dso_process (void * p)
function fun_vec[DSO_SHARED_FILES];
char dso_path[DSO_SHARED_FILES][100];
int dso;
- uintptr_t t = (uintptr_t) p;
+ int t = (int) (uintptr_t) p;
/* Open DSOs and get a function. */
for (dso = 0; dso < DSO_SHARED_FILES; dso++)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
nptl/tst-stack4.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources