diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2011-11-17 14:46:07 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2011-11-17 14:46:07 +0100 |
| commit | bd3c1a2495cbcb51b606f8e4892fcd127f91e645 (patch) | |
| tree | 44b2911fe5abf044c3a1097cbe144f036a9b562f | |
| parent | 1ea3c5e6f11b91466546020f4e9ec13d1ab81be3 (diff) | |
misc: hide __gen_tempname
fix signed vs. unsigned comparison warnings while at it
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | libc/misc/internals/tempname.c | 6 | ||||
| -rw-r--r-- | libc/misc/internals/tempname.h | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c index 0db28455b..28c0098f5 100644 --- a/libc/misc/internals/tempname.c +++ b/libc/misc/internals/tempname.c @@ -110,7 +110,7 @@ int attribute_hidden ___path_search (char *tmpl, size_t tmpl_len, const char *di dlen--; /* remove trailing slashes */ /* check we have room for "${dir}/${pfx}XXXXXX\0" */ - if (tmpl_len < dlen + 1 + plen + 6 + 1) + if (tmpl_len < (size_t)dlen + 1 + plen + 6 + 1) { __set_errno (EINVAL); return -1; @@ -178,7 +178,7 @@ static void brain_damaged_fillrand(unsigned char *buf, unsigned int len) __GT_DIR: create a directory with given mode. */ -int __gen_tempname (char *tmpl, int kind, mode_t mode) +int attribute_hidden __gen_tempname (char *tmpl, int kind, mode_t mode) { char *XXXXXX; unsigned int i; @@ -196,7 +196,7 @@ int __gen_tempname (char *tmpl, int kind, mode_t mode) } for (i = 0; i < TMP_MAX; ++i) { - int j; + unsigned char j; /* Get some random data. */ if (fillrand(randomness, sizeof(randomness)) != sizeof(randomness)) { /* if random device nodes failed us, lets use the braindamaged ver */ diff --git a/libc/misc/internals/tempname.h b/libc/misc/internals/tempname.h index 017dc5190..e75b632d8 100644 --- a/libc/misc/internals/tempname.h +++ b/libc/misc/internals/tempname.h @@ -10,7 +10,7 @@ extern int ___path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx /*, int try_tmpdir */) attribute_hidden; #define __path_search(tmpl, tmpl_len, dir, pfx, try_tmpdir) ___path_search(tmpl, tmpl_len, dir, pfx) -extern int __gen_tempname (char *__tmpl, int __kind, mode_t mode); +extern int __gen_tempname (char *__tmpl, int __kind, mode_t mode) attribute_hidden; /* The __kind argument to __gen_tempname may be one of: */ #define __GT_FILE 0 /* create a file */ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch index f1b553572..e28cec247 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch @@ -62,7 +62,7 @@ libpthread_linux_CSRC += pthread_attr_getaffinity.c pthread_attr_setaffinity.c \ pthread_getcpuclockid.c pthread_kill.c \ pthread_mutex_cond_lock.c pthread_yield.c \ sem_post.c sem_timedwait.c sem_trywait.c sem_wait.c \ - pt-fork.c pt-sleep.c pthread_sigqueue.c \ + pt-fork.c pt-sleep.c pthread_sigqueue.c pt-tempname.c \ sigtimedwait.c sigwaitinfo.c sigwait.c \ lowlevellock.c lowlevelrobustlock.c |