[src/trunk]: src/sys/dev/cardbus Don't use __func__ as variable. It prevents...

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

details:   https://anonhg.NetBSD.org/src/rev/47e97b142a0f
branches:  trunk
changeset: 517909:47e97b142a0f
user:      enami <enami%NetBSD.org@localhost>
date:      Wed Nov 21 09:08:38 2001 +0000

description:
Don't use __func__ as variable.  It prevents compilation.
Use __FUNCTION__ instead.

diffstat:

 sys/dev/cardbus/cardbus.c |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 1cef9c6f2b8c -r 47e97b142a0f sys/dev/cardbus/cardbus.c
--- a/sys/dev/cardbus/cardbus.c Wed Nov 21 08:18:39 2001 +0000
+++ b/sys/dev/cardbus/cardbus.c Wed Nov 21 09:08:38 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardbus.c,v 1.38 2001/11/15 09:48:02 lukem Exp $       */
+/*     $NetBSD: cardbus.c,v 1.39 2001/11/21 09:08:38 enami Exp $       */
 
 /*
  * Copyright (c) 1997, 1998, 1999 and 2000
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.38 2001/11/15 09:48:02 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.39 2001/11/21 09:08:38 enami Exp $");
 
 #include "opt_cardbus.h"
 
@@ -287,9 +287,6 @@
 static void
 parse_tuple(u_int8_t *tuple, int len, void *data)
 {
-#ifdef CARDBUS_DEBUG
-       static const char __func__[] = "parse_tuple";
-#endif
        struct cardbus_cis_info *cis = data;
        char *p;
        int i, bar_index;
@@ -298,7 +295,7 @@
        case PCMCIA_CISTPL_MANFID:
                if (tuple[1] != 5) {
                        DPRINTF(("%s: wrong length manufacturer id (%d)\n",
-                           __func__, tuple[1]));
+                           __FUNCTION__, tuple[1]));
                        break;
                }
                cis->manufacturer = tuple[2] | (tuple[3] << 8);
@@ -323,12 +320,13 @@
        case PCMCIA_CISTPL_BAR:
                if (tuple[1] != 6) {
                        DPRINTF(("%s: BAR with short length (%d)\n",
-                           __func__, tuple[1]));
+                           __FUNCTION__, tuple[1]));
                        break;
                }
                bar_index = tuple[2] & 7;
                if (bar_index == 0) {
-                       DPRINTF(("%s: invalid ASI in BAR tuple\n", __func__));
+                       DPRINTF(("%s: invalid ASI in BAR tuple\n",
+                           __FUNCTION__));
                        break;
                }
                bar_index--;
@@ -362,7 +360,7 @@
                                    sizeof(cis->funce.network.netid)) {
                                        DPRINTF(("%s: unknown network id type "
                                            "(len = %d)\n",
-                                           __func__, tuple[3]));
+                                           __FUNCTION__, tuple[3]));
                                } else {
                                        cis->funce.network.netid_present = 1;
                                        memcpy(cis->funce.network.netid,