[src/trunk]: src/sys/dev fix lint warnings about things being stringified und...

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

details:   https://anonhg.NetBSD.org/src/rev/a3943edd6b85
branches:  trunk
changeset: 538596:a3943edd6b85
user:      perry <perry%NetBSD.org@localhost>
date:      Wed Oct 23 01:50:11 2002 +0000

description:
fix lint warnings about things being stringified under cpp -traditional

diffstat:

 sys/dev/mii/tlphy.c  |   6 +++---
 sys/dev/pci/if_pcn.c |  12 ++++++------
 sys/dev/pci/pci.c    |   6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (97 lines):

diff -r 47b7fabf3c88 -r a3943edd6b85 sys/dev/mii/tlphy.c
--- a/sys/dev/mii/tlphy.c       Wed Oct 23 01:34:58 2002 +0000
+++ b/sys/dev/mii/tlphy.c       Wed Oct 23 01:50:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tlphy.c,v 1.37 2002/10/02 16:34:21 thorpej Exp $       */
+/*     $NetBSD: tlphy.c,v 1.38 2002/10/23 01:50:11 perry Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.37 2002/10/02 16:34:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.38 2002/10/23 01:50:11 perry Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -177,7 +177,7 @@
 
 
 #define        ADD(m, c)       ifmedia_add(&mii->mii_media, (m), (c), NULL)
-#define        PRINT(s)        printf("%s%s", sep, s); sep = ", "
+#define        PRINT(str)      printf("%s%s", sep, str); sep = ", "
 
        printf("%s: ", sc->sc_mii.mii_dev.dv_xname);
        if (sc->sc_tlphycap) {
diff -r 47b7fabf3c88 -r a3943edd6b85 sys/dev/pci/if_pcn.c
--- a/sys/dev/pci/if_pcn.c      Wed Oct 23 01:34:58 2002 +0000
+++ b/sys/dev/pci/if_pcn.c      Wed Oct 23 01:50:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_pcn.c,v 1.16 2002/10/22 16:13:44 thorpej Exp $      */
+/*     $NetBSD: if_pcn.c,v 1.17 2002/10/23 01:50:12 perry Exp $        */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.16 2002/10/22 16:13:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.17 2002/10/23 01:50:12 perry Exp $");
 
 #include "bpfilter.h"
 
@@ -1410,10 +1410,10 @@
                                        printf("%s: overflow error\n",
                                            sc->sc_dev.dv_xname);
                                else {
-#define        PRINTIT(x, s)                                                   \
+#define        PRINTIT(x, str)                                                 \
                                        if (rmd1 & (x))                 \
                                                printf("%s: %s\n",      \
-                                                   sc->sc_dev.dv_xname, s);
+                                                   sc->sc_dev.dv_xname, str);
                                        PRINTIT(LE_R1_FRAM, "framing error");
                                        PRINTIT(LE_R1_CRC, "CRC error");
                                        PRINTIT(LE_R1_BUFF, "buffer error");
@@ -1952,9 +1952,9 @@
        ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, pcn_79c970_mediachange,
            pcn_79c970_mediastatus);
 
-#define        ADD(s, m, d)                                                    \
+#define        ADD(str, m, d)                                                  \
 do {                                                                   \
-       printf("%s%s", sep, s);                                         \
+       printf("%s%s", sep, str);                                       \
        ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|(m), (d), NULL);   \
        sep = ", ";                                                     \
 } while (/*CONSTCOND*/0)
diff -r 47b7fabf3c88 -r a3943edd6b85 sys/dev/pci/pci.c
--- a/sys/dev/pci/pci.c Wed Oct 23 01:34:58 2002 +0000
+++ b/sys/dev/pci/pci.c Wed Oct 23 01:50:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci.c,v 1.73 2002/10/02 16:51:50 thorpej Exp $ */
+/*     $NetBSD: pci.c,v 1.74 2002/10/23 01:50:12 perry Exp $   */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.73 2002/10/02 16:51:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.74 2002/10/23 01:50:12 perry Exp $");
 
 #include "opt_pci.h"
 
@@ -140,7 +140,7 @@
                return;
        }
 
-#define        PRINT(s)        do { printf("%s%s", sep, s); sep = ", "; } while (0)
+#define        PRINT(str)      do { printf("%s%s", sep, str); sep = ", "; } while (0)
 
        printf("%s: ", self->dv_xname);