diff options
| author | obrien <obrien@FreeBSD.org> | 2001-12-10 08:09:49 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2001-12-10 08:09:49 +0000 |
| commit | 7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6 (patch) | |
| tree | b580d740769b3b201f76ad941e8b0b8ca3015bc0 /sys/netgraph/ng_pptpgre.c | |
| parent | 957a76ab241ec60b1b21124054416935dba9688b (diff) | |
| download | FreeBSD-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/netgraph/ng_pptpgre.c')
| -rw-r--r-- | sys/netgraph/ng_pptpgre.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c index 6576efd..f531353 100644 --- a/sys/netgraph/ng_pptpgre.c +++ b/sys/netgraph/ng_pptpgre.c @@ -399,7 +399,7 @@ ng_pptpgre_rcvdata(hook_p hook, item_p item) return ng_pptpgre_xmit(node, item); if (hook == priv->lower) return ng_pptpgre_recv(node, item); - panic("%s: weird hook", __FUNCTION__); + panic("%s: weird hook", __func__); } /* @@ -436,7 +436,7 @@ ng_pptpgre_disconnect(hook_p hook) else if (hook == priv->lower) priv->lower = NULL; else - panic("%s: unknown hook", __FUNCTION__); + panic("%s: unknown hook", __func__); /* Go away if no longer connected to anything */ if ((NG_NODE_NUMHOOKS(node) == 0) @@ -745,7 +745,7 @@ ng_pptpgre_start_recv_ack_timer(node_p node) /* Compute how long until oldest unack'd packet times out, and reset the timer to that time. */ - KASSERT(a->rackTimerPtr == NULL, ("%s: rackTimer", __FUNCTION__)); + KASSERT(a->rackTimerPtr == NULL, ("%s: rackTimer", __func__)); remain = (a->timeSent[0] + a->ato) - ng_pptpgre_time(node); if (remain < 0) remain = 0; @@ -784,7 +784,7 @@ ng_pptpgre_recv_ack_timeout(void *arg) /* This complicated stuff is needed to avoid race conditions */ FREE(arg, M_NETGRAPH); - KASSERT(node->nd_refs > 0, ("%s: no nd_refs", __FUNCTION__)); + KASSERT(node->nd_refs > 0, ("%s: no nd_refs", __func__)); if (NG_NODE_NOT_VALID(node)) { /* shutdown race condition */ NG_NODE_UNREF(node); splx(s); @@ -833,7 +833,7 @@ ng_pptpgre_start_send_ack_timer(node_p node, int ackTimeout) int ticks; /* Start new timer */ - KASSERT(a->sackTimerPtr == NULL, ("%s: sackTimer", __FUNCTION__)); + KASSERT(a->sackTimerPtr == NULL, ("%s: sackTimer", __func__)); MALLOC(a->sackTimerPtr, node_p *, sizeof(node_p), M_NETGRAPH, M_NOWAIT); if (a->sackTimerPtr == NULL) { priv->stats.memoryFailures++; @@ -864,7 +864,7 @@ ng_pptpgre_send_ack_timeout(void *arg) /* This complicated stuff is needed to avoid race conditions */ FREE(arg, M_NETGRAPH); - KASSERT(node->nd_refs > 0, ("%s: no nd_refs", __FUNCTION__)); + KASSERT(node->nd_refs > 0, ("%s: no nd_refs", __func__)); if (NG_NODE_NOT_VALID(node)) { /* shutdown race condition */ NG_NODE_UNREF(node); splx(s); |
