summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-12-10 08:09:49 +0000
committerobrien <obrien@FreeBSD.org>2001-12-10 08:09:49 +0000
commit7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6 (patch)
treeb580d740769b3b201f76ad941e8b0b8ca3015bc0 /sys/netinet
parent957a76ab241ec60b1b21124054416935dba9688b (diff)
downloadFreeBSD-src-7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6.zip
FreeBSD-src-7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6.tar.gz
Update to C99, s/__FUNCTION__/__func__/,
also don't use ANSI string concatenation.
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_divert.c4
-rw-r--r--sys/netinet/tcp_output.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 56a602ac..1341e18 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -150,7 +150,7 @@ divert_packet(struct mbuf *m, int incoming, int port)
u_int16_t nport;
/* Sanity check */
- KASSERT(port != 0, ("%s: port=0", __FUNCTION__));
+ KASSERT(port != 0, ("%s: port=0", __func__));
/* Record and reset divert cookie */
divsrc.sin_port = ip_divert_cookie;
@@ -172,7 +172,7 @@ divert_packet(struct mbuf *m, int incoming, int port)
struct ifaddr *ifa;
/* Sanity check */
- KASSERT((m->m_flags & M_PKTHDR), ("%s: !PKTHDR", __FUNCTION__));
+ KASSERT((m->m_flags & M_PKTHDR), ("%s: !PKTHDR", __func__));
/* Find IP address for receive interface */
TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrhead, ifa_link) {
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index fa884ab..13f5ca9 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -759,7 +759,7 @@ send:
/* IP version must be set here for ipv4/ipv6 checking later */
KASSERT(ip->ip_v == IPVERSION,
- ("%s: IP version incorrect: %d", __FUNCTION__, ip->ip_v));
+ ("%s: IP version incorrect: %d", __func__, ip->ip_v));
}
/*
OpenPOWER on IntegriCloud