From 7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6 Mon Sep 17 00:00:00 2001 From: obrien Date: Mon, 10 Dec 2001 08:09:49 +0000 Subject: Update to C99, s/__FUNCTION__/__func__/, also don't use ANSI string concatenation. --- sys/net/if_ef.c | 4 ++-- sys/net/if_ethersubr.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/net') diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c index 5e85819..5caf365 100644 --- a/sys/net/if_ef.c +++ b/sys/net/if_ef.c @@ -69,12 +69,12 @@ #define EF_NFT 4 /* total number of frame types */ #ifdef EF_DEBUG -#define EFDEBUG(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define EFDEBUG(format, args...) printf("%s: "format, __func__ ,## args) #else #define EFDEBUG(format, args...) #endif -#define EFERROR(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define EFERROR(format, args...) printf("%s: "format, __func__ ,## args) struct efnet { struct arpcom ef_ac; diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 3351c22..7b2b365 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -665,7 +665,7 @@ ether_ifattach(ifp, bpf) ifp->if_baudrate = 10000000; ifp->if_broadcastaddr = etherbroadcastaddr; ifa = ifaddr_byindex(ifp->if_index); - 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_ETHER; sdl->sdl_alen = ifp->if_addrlen; -- cgit v1.1