From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 14 Jun 2011 00:52:01 +0000 (-0400)
Subject: avoid 64bit warnings when using pointers as entropy for temp names
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=0e1762539c2ad359ba10502cdfb750b5afd2329e

avoid 64bit warnings when using pointers as entropy for temp names
---

diff --git a/src/stdio/tempnam.c b/src/stdio/tempnam.c
index dc4f2bad..f73ca9f9 100644
--- a/src/stdio/tempnam.c
+++ b/src/stdio/tempnam.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <time.h>
 #include "libc.h"
@@ -30,7 +31,7 @@ char *tempnam(const char *dir, const char *pfx)
 
 	do {
 		clock_gettime(CLOCK_REALTIME, &ts);
-		n = ts.tv_nsec ^ (unsigned)&s ^ (unsigned)s;
+		n = ts.tv_nsec ^ (uintptr_t)&s ^ (uintptr_t)s;
 		snprintf(s, l, "%s/%s-%d-%d-%x", dir, pfx, pid, a_fetch_add(&index, 1), n);
 	} while (!access(s, F_OK) && try++<MAXTRIES);
 	if (try>=MAXTRIES) {
diff --git a/src/stdio/tmpnam.c b/src/stdio/tmpnam.c
index 010cf039..2bd72b3b 100644
--- a/src/stdio/tmpnam.c
+++ b/src/stdio/tmpnam.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <time.h>
 #include "libc.h"
@@ -23,7 +24,7 @@ char *tmpnam(char *s)
 
 	do {
 		__syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts, 0);
-		n = ts.tv_nsec ^ (unsigned)&s ^ (unsigned)s;
+		n = ts.tv_nsec ^ (uintptr_t)&s ^ (uintptr_t)s;
 		snprintf(s, L_tmpnam, "/tmp/t%x-%x", a_fetch_add(&index, 1), n);
 	} while (!__syscall(SYS_access, s, F_OK) && try++<MAXTRIES);
 	return try>=MAXTRIES ? 0 : s;