[src/trunk]: src/sys/lib/libsa Rename local variables `read' to `nread' to sh...

[itohy <itohy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/572557ba3ed3
branches:  trunk
changeset: 553518:572557ba3ed3
user:      itohy <itohy%NetBSD.org@localhost>
date:      Sat Oct 18 06:39:12 2003 +0000

description:
Rename local variables `read' to `nread' to shut up -Wshadow.

diffstat:

 sys/lib/libsa/cd9660.c |  36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diffs (96 lines):

diff -r 5b6367159f2f -r 572557ba3ed3 sys/lib/libsa/cd9660.c
--- a/sys/lib/libsa/cd9660.c    Sat Oct 18 05:06:43 2003 +0000
+++ b/sys/lib/libsa/cd9660.c    Sat Oct 18 06:39:12 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660.c,v 1.14 2003/08/21 00:00:52 elric Exp $        */
+/*     $NetBSD: cd9660.c,v 1.15 2003/10/18 06:39:12 itohy Exp $        */
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -141,7 +141,7 @@
        struct file *fp = 0;
        void *buf;
        struct iso_primary_descriptor *vd;
-       size_t buf_size, read, psize, dsize;
+       size_t buf_size, nread, psize, dsize;
        daddr_t bno;
        int parent, ent;
        struct ptable_ent *pp;
@@ -156,10 +156,10 @@
                twiddle();
 #endif
                rc = DEV_STRATEGY(f->f_dev)(f->f_devdata, F_READ, cdb2devb(bno),
-                                          ISO_DEFAULT_BLOCK_SIZE, buf, &read);
+                                          ISO_DEFAULT_BLOCK_SIZE, buf, &nread);
                if (rc)
                        goto out;
-               if (read != ISO_DEFAULT_BLOCK_SIZE) {
+               if (nread != ISO_DEFAULT_BLOCK_SIZE) {
                        rc = EIO;
                        goto out;
                }
@@ -187,10 +187,10 @@
        twiddle();
 #endif
        rc = DEV_STRATEGY(f->f_dev)(f->f_devdata, F_READ, cdb2devb(bno),
-                                  buf_size, buf, &read);
+                                  buf_size, buf, &nread);
        if (rc)
                goto out;
-       if (read != buf_size) {
+       if (nread != buf_size) {
                rc = EIO;
                goto out;
        }
@@ -240,10 +240,10 @@
                        rc = DEV_STRATEGY(f->f_dev)(f->f_devdata, F_READ,
                                                   cdb2devb(bno),
                                                   ISO_DEFAULT_BLOCK_SIZE,
-                                                  buf, &read);
+                                                  buf, &nread);
                        if (rc)
                                goto out;
-                       if (read != ISO_DEFAULT_BLOCK_SIZE) {
+                       if (nread != ISO_DEFAULT_BLOCK_SIZE) {
                                rc = EIO;
                                goto out;
                        }
@@ -315,7 +315,7 @@
        daddr_t bno;
        char buf[ISO_DEFAULT_BLOCK_SIZE];
        char *dp;
-       size_t read, off;
+       size_t nread, off;
        
        while (size) {
                if (fp->off < 0 || fp->off >= fp->size)
@@ -330,20 +330,20 @@
                twiddle();      
 #endif
                rc = DEV_STRATEGY(f->f_dev)(f->f_devdata, F_READ, cdb2devb(bno),
-                                          ISO_DEFAULT_BLOCK_SIZE, dp, &read);
+                                          ISO_DEFAULT_BLOCK_SIZE, dp, &nread);
                if (rc)
                        return rc;
-               if (read != ISO_DEFAULT_BLOCK_SIZE)
+               if (nread != ISO_DEFAULT_BLOCK_SIZE)
                        return EIO;
                if (dp == buf) {
                        off = fp->off & (ISO_DEFAULT_BLOCK_SIZE - 1);
-                       if (read > off + size)
-                               read = off + size;
-                       read -= off;
-                       bcopy(buf + off, start, read);
-                       start = (caddr_t)start + read;
-                       fp->off += read;
-                       size -= read;
+                       if (nread > off + size)
+                               nread = off + size;
+                       nread -= off;
+                       bcopy(buf + off, start, nread);
+                       start = (caddr_t)start + nread;
+                       fp->off += nread;
+                       size -= nread;
                } else {
                        start = (caddr_t)start + ISO_DEFAULT_BLOCK_SIZE;
                        fp->off += ISO_DEFAULT_BLOCK_SIZE;