about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-12-02 22:48:59 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-12-02 22:48:59 +0000
commit909e16d96064708b43170eeb01135315f540e6ff (patch)
treed6ef0169d3e8b67fbf4ce8c75c8e25e2270e70e8
parent4e0b901601038c863b97e68b18ae50a82e10a157 (diff)
downloadglibc-909e16d96064708b43170eeb01135315f540e6ff.tar.gz
glibc-909e16d96064708b43170eeb01135315f540e6ff.tar.xz
glibc-909e16d96064708b43170eeb01135315f540e6ff.zip
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.
-rw-r--r--ChangeLog2
-rw-r--r--nptl/tst-stack4.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51df3b5980..a2c8b76b42 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 d9c8df2c8d..3b72693646 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++)