[src/trunk]: src/sys prepend an underscore to local variables in macros, to a...

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

details:   https://anonhg.NetBSD.org/src/rev/4dbc7bf560a1
branches:  trunk
changeset: 581446:4dbc7bf560a1
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed Jun 01 18:03:50 2005 +0000

description:
prepend an underscore to local variables in macros, to avoid shadowing
user defined ones

diffstat:

 sys/sys/mbuf.h     |  6 +++---
 sys/uvm/uvm_stat.h |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 7ca93e36c1e1 -r 4dbc7bf560a1 sys/sys/mbuf.h
--- a/sys/sys/mbuf.h    Wed Jun 01 17:33:21 2005 +0000
+++ b/sys/sys/mbuf.h    Wed Jun 01 18:03:50 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbuf.h,v 1.107 2005/05/23 17:34:07 dbj Exp $   */
+/*     $NetBSD: mbuf.h,v 1.108 2005/06/01 18:03:50 drochner Exp $      */
 
 /*-
  * Copyright (c) 1996, 1997, 1999, 2001 The NetBSD Foundation, Inc.
@@ -338,9 +338,9 @@
  */
 #define        MBUFLOCK(code)                                                  \
 do {                                                                   \
-       int ms = splvm();                                               \
+       int _ms = splvm();                                              \
        { code }                                                        \
-       splx(ms);                                                       \
+       splx(_ms);                                                      \
 } while (/* CONSTCOND */ 0)
 
 #ifdef MBUFTRACE
diff -r 7ca93e36c1e1 -r 4dbc7bf560a1 sys/uvm/uvm_stat.h
--- a/sys/uvm/uvm_stat.h        Wed Jun 01 17:33:21 2005 +0000
+++ b/sys/uvm/uvm_stat.h        Wed Jun 01 18:03:50 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_stat.h,v 1.35 2004/11/23 05:08:33 yamt Exp $       */
+/*     $NetBSD: uvm_stat.h,v 1.36 2005/06/01 18:03:50 drochner Exp $   */
 
 /*
  *
@@ -176,11 +176,11 @@
 #define UVMHIST_CALLED(NAME) \
 do { \
        { \
-               int s = splhigh(); \
+               int _s = splhigh(); \
                simple_lock(&(NAME).l); \
                _uvmhist_call = _uvmhist_cnt++; \
                simple_unlock(&(NAME).l); \
-               splx(s); \
+               splx(_s); \
        } \
        UVMHIST_LOG(NAME,"called!", 0, 0, 0, 0); \
 } while (/*CONSTCOND*/ 0)