Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/stdio Fix "shadows a global declaration" compile er...



details:   https://anonhg.NetBSD.org/src/rev/dd61d87e7278
branches:  trunk
changeset: 330047:dd61d87e7278
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jun 19 05:31:15 2014 +0000

description:
Fix "shadows a global declaration" compile error.

diffstat:

 lib/libc/stdio/gettemp.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 74353de49ef4 -r dd61d87e7278 lib/libc/stdio/gettemp.c
--- a/lib/libc/stdio/gettemp.c  Wed Jun 18 20:12:15 2014 +0000
+++ b/lib/libc/stdio/gettemp.c  Thu Jun 19 05:31:15 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gettemp.c,v 1.18 2014/06/18 17:47:58 christos Exp $    */
+/*     $NetBSD: gettemp.c,v 1.19 2014/06/19 05:31:15 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)mktemp.c   8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: gettemp.c,v 1.18 2014/06/18 17:47:58 christos Exp $");
+__RCSID("$NetBSD: gettemp.c,v 1.19 2014/06/19 05:31:15 msaitoh Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -56,7 +56,7 @@
        char *pad;
        struct stat sbuf;
        int rval;
-       uint32_t rand;
+       uint32_t r;
        char carrybuf[MAXPATHLEN];
 
        _DIAGASSERT(path != NULL);
@@ -85,8 +85,8 @@
 
        /* Fill space with random characters */
        while (trv >= path && *trv == 'X') {
-               rand = arc4random_uniform(sizeof(padchar) - 1);
-               *trv-- = padchar[rand];
+               r = arc4random_uniform(sizeof(padchar) - 1);
+               *trv-- = padchar[r];
        }
        start = trv + 1;
 



Home | Main Index | Thread Index | Old Index