Source-Changes-HG archive

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

[src/trunk]: src/sys/dev Don't use new as a variable name.



details:   https://anonhg.NetBSD.org/src/rev/7e72a43ea4fe
branches:  trunk
changeset: 332015:7e72a43ea4fe
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 05 05:27:23 2014 +0000

description:
Don't use new as a variable name.

diffstat:

 sys/dev/ld.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (50 lines):

diff -r bf71d7bfe9c4 -r 7e72a43ea4fe sys/dev/ld.c
--- a/sys/dev/ld.c      Fri Sep 05 05:26:26 2014 +0000
+++ b/sys/dev/ld.c      Fri Sep 05 05:27:23 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ld.c,v 1.75 2014/08/10 16:44:35 tls Exp $      */
+/*     $NetBSD: ld.c,v 1.76 2014/09/05 05:27:23 matt Exp $     */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.75 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.76 2014/09/05 05:27:23 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -570,7 +570,7 @@
        case DIOCSSTRATEGY:
            {
                struct disk_strategy *dks = (void *)addr;
-               struct bufq_state *new, *old;
+               struct bufq_state *new_bufq, *old_bufq;
 
                if ((flag & FWRITE) == 0)
                        return EPERM;
@@ -579,17 +579,17 @@
                        return EINVAL;
 
                dks->dks_name[sizeof(dks->dks_name) - 1] = 0; /* ensure term */
-               error = bufq_alloc(&new, dks->dks_name,
+               error = bufq_alloc(&new_bufq, dks->dks_name,
                    BUFQ_EXACT|BUFQ_SORT_RAWBLOCK);
                if (error)
                        return error;
 
                mutex_enter(&sc->sc_mutex);
-               old = sc->sc_bufq;
-               bufq_move(new, old);
-               sc->sc_bufq = new;
+               old_bufq = sc->sc_bufq;
+               bufq_move(new_bufq, old_bufq);
+               sc->sc_bufq = new_bufq;
                mutex_exit(&sc->sc_mutex);
-               bufq_free(old);
+               bufq_free(old_bufq);
 
                return 0;
            }



Home | Main Index | Thread Index | Old Index