[src/trunk]: src/sys/dev/cardbus Don't use not-in-user-namespace variable nam...

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

details:   https://anonhg.NetBSD.org/src/rev/cee591005d7c
branches:  trunk
changeset: 485901:cee591005d7c
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon May 08 18:23:36 2000 +0000

description:
Don't use not-in-user-namespace variable names that newer versions of
GCC doesn't like very much.

diffstat:

 sys/dev/cardbus/cardbus_exrom.c  |  10 +++++-----
 sys/dev/cardbus/if_fxp_cardbus.c |   6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 1ac128f1cfd5 -r cee591005d7c sys/dev/cardbus/cardbus_exrom.c
--- a/sys/dev/cardbus/cardbus_exrom.c   Mon May 08 18:22:29 2000 +0000
+++ b/sys/dev/cardbus/cardbus_exrom.c   Mon May 08 18:23:36 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_exrom.c,v 1.4 2000/02/03 06:47:31 thorpej Exp $ */
+/* $NetBSD: cardbus_exrom.c,v 1.5 2000/05/08 18:23:36 thorpej Exp $ */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
      bus_space_handle_t romh;
      struct cardbus_rom_image_head *head;
 {
-    static const char __func__[] = "cardbus_read_exrom";
+    static const char thisfunc[] = "cardbus_read_exrom";
 
     size_t addr = 0; /* offset of current rom image */
     size_t dataptr;
@@ -107,7 +107,7 @@
        val = READ_INT16(romt, romh, addr + CARDBUS_EXROM_SIGNATURE);
        if(val != 0xaa55) {
            printf("%s: bad header signature in ROM image %u: 0x%04x\n", 
-                  __func__, rom_image, val);
+                  thisfunc, rom_image, val);
            return 1;
        }
        dataptr = addr + READ_INT16(romt, romh, addr + CARDBUS_EXROM_DATA_PTR);
@@ -121,7 +121,7 @@
        image_size <<= 9;
        image = malloc(sizeof(*image), M_DEVBUF, M_NOWAIT);
        if(image == NULL) {
-           printf("%s: out of memory\n", __func__);
+           printf("%s: out of memory\n", thisfunc);
            return 1;
        }
        image->rom_image = rom_image;
@@ -129,7 +129,7 @@
        image->romt = romt;
        if(bus_space_subregion(romt, romh, addr, 
                               image_size, &image->romh)) {
-           printf("%s: bus_space_subregion failed", __func__);
+           printf("%s: bus_space_subregion failed", thisfunc);
            free(image, M_DEVBUF);
            return 1;
        }
diff -r 1ac128f1cfd5 -r cee591005d7c sys/dev/cardbus/if_fxp_cardbus.c
--- a/sys/dev/cardbus/if_fxp_cardbus.c  Mon May 08 18:22:29 2000 +0000
+++ b/sys/dev/cardbus/if_fxp_cardbus.c  Mon May 08 18:23:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fxp_cardbus.c,v 1.11 2000/03/22 00:17:46 thorpej Exp $      */
+/*     $NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $      */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -141,7 +141,7 @@
        struct device *parent, *self;
        void *aux;
 {
-       static const char __func__[] = "fxp_cardbus_attach";
+       static const char thisfunc[] = "fxp_cardbus_attach";
 
        struct fxp_softc *sc = (struct fxp_softc *) self;
        struct fxp_cardbus_softc *csc = (struct fxp_cardbus_softc *) self;
@@ -171,7 +171,7 @@
                sc->sc_sh = memh;
                csc->size = size;
        } else
-               panic("%s: failed to allocate mem and io space", __func__);
+               panic("%s: failed to allocate mem and io space", thisfunc);
 
 
        if (ca->ca_cis.cis1_info[0] && ca->ca_cis.cis1_info[1])