From 3bd075200eaa147ab43ca95e4d52cdc3d7eb37b1 Mon Sep 17 00:00:00 2001 From: stefanf Date: Wed, 22 Sep 2004 17:16:04 +0000 Subject: Prefer C99's __func__ over GCC's __FUNCTION__. --- sys/dev/pdq/pdq.c | 2 +- sys/net/if_arcsubr.c | 2 +- sys/netinet6/ip6_fw.c | 2 +- sys/pci/viapm.c | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'sys') diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c index 5a65885..9fb29ad 100644 --- a/sys/dev/pdq/pdq.c +++ b/sys/dev/pdq/pdq.c @@ -1579,7 +1579,7 @@ pdq_initialize( p = (pdq_uint8_t *) PDQ_OS_MEMALLOC_CONTIG(contig_bytes); if (p == NULL) - printf("%s() - PDQ_OS_MEMALLOC_CONTIG() failed!\n", __FUNCTION__); + printf("%s() - PDQ_OS_MEMALLOC_CONTIG() failed!\n", __func__); if (p != NULL) { pdq_physaddr_t physaddr = PDQ_OS_VA_TO_BUSPA(pdq, p); diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index a4a487e..fb221ab 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -653,7 +653,7 @@ arc_ifattach(ifp, lla) #else ifa = ifaddr_byindex(ifp->if_index); #endif - KASSERT(ifa != NULL, ("%s: no lladdr!\n", __FUNCTION__)); + KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__)); sdl = (struct sockaddr_dl *)ifa->ifa_addr; sdl->sdl_type = IFT_ARCNET; sdl->sdl_alen = ifp->if_addrlen; diff --git a/sys/netinet6/ip6_fw.c b/sys/netinet6/ip6_fw.c index c7c812d..ee34741 100644 --- a/sys/netinet6/ip6_fw.c +++ b/sys/netinet6/ip6_fw.c @@ -1243,7 +1243,7 @@ ip6_fw_init(void) default_rule.fw_flg |= IPV6_FW_F_IN | IPV6_FW_F_OUT; if (check_ip6fw_struct(&default_rule) == NULL || add_entry6(&ip6_fw_chain, &default_rule)) - panic(__FUNCTION__); + panic(__func__); printf("IPv6 packet filtering initialized, "); #ifdef IPV6FIREWALL_DEFAULT_TO_ACCEPT diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c index 8d37024..f6c061d 100644 --- a/sys/pci/viapm.c +++ b/sys/pci/viapm.c @@ -636,8 +636,7 @@ viasmb_quick(device_t dev, u_char slave, int how) VIAPM_OUTB(SMBHADDR, slave | LSB); break; default: - panic("%s: unknown QUICK command (%x)!", __FUNCTION__, - how); + panic("%s: unknown QUICK command (%x)!", __func__, how); } VIAPM_OUTB(SMBHCTRL, SMBHCTRL_START | SMBHCTRL_QUICK); -- cgit v1.1