From d28843a4498c5151ada3a223717f95f0b8050a99 Mon Sep 17 00:00:00 2001
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 13 Oct 2010 17:21:21 +0000
Subject: [PATCH] When calling panic(), always pass a format string.

---
 sys/netgraph/ng_UI.c          | 4 ++--
 sys/netgraph/ng_async.c       | 4 ++--
 sys/netgraph/ng_frame_relay.c | 2 +-
 sys/netgraph/ng_gif_demux.c   | 2 +-
 sys/netgraph/ng_iface.c       | 2 +-
 sys/netgraph/ng_rfc1490.c     | 4 ++--
 sys/netgraph/ng_socket.c      | 2 +-
 sys/netgraph/ng_tty.c         | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index a8968776f847..2c3f132092e4 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -197,7 +197,7 @@ ng_UI_rcvdata(hook_p hook, item_p item)
 		mtod(m, u_char *)[0] = HDLC_UI;
 		NG_FWD_NEW_DATA(error, item, priv->downlink, m);	/* m -> NULL */
 	} else
-		panic(__func__);
+		panic("%s", __func__);
 
 done:
 	NG_FREE_M(m);	/* does nothing if m == NULL */
@@ -234,7 +234,7 @@ ng_UI_disconnect(hook_p hook)
 	else if (hook == priv->uplink)
 		priv->uplink = NULL;
 	else
-		panic(__func__);
+		panic("%s", __func__);
 	/*
 	 * If we are not already shutting down,
 	 * and we have no more hooks, then DO shut down.
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c
index 77c96df6d469..acbd76aefdc4 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -256,7 +256,7 @@ nga_rcvdata(hook_p hook, item_p item)
 		return (nga_rcv_sync(sc, item));
 	if (hook == sc->async)
 		return (nga_rcv_async(sc, item));
-	panic(__func__);
+	panic("%s", __func__);
 }
 
 /*
@@ -372,7 +372,7 @@ nga_disconnect(hook_p hook)
 	else if (hook == sc->sync)
 		hookp = &sc->sync;
 	else
-		panic(__func__);
+		panic("%s", __func__);
 	if (!*hookp)
 		panic("%s 2", __func__);
 	*hookp = NULL;
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index 599e80ee310b..670ef17a1b28 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -396,7 +396,7 @@ ngfrm_rcvdata(hook_p hook, item_p item)
 		data[3] |= BYTEX_EA;
 		break;
 	default:
-		panic(__func__);
+		panic("%s", __func__);
 	}
 
 	/* Send it */
diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c
index a5ac5e149a40..3e882199c3d8 100644
--- a/sys/netgraph/ng_gif_demux.c
+++ b/sys/netgraph/ng_gif_demux.c
@@ -391,7 +391,7 @@ ng_gif_demux_disconnect(hook_p hook)
 	else {
 		iffam = get_iffam_from_hook(priv, hook);
 		if (iffam == NULL)
-			panic(__func__);
+			panic("%s", __func__);
 		*get_hook_from_iffam(priv, iffam) = NULL;
 	}
 
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index f94fd14930fd..03ad016c2ab2 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -821,7 +821,7 @@ ng_iface_disconnect(hook_p hook)
 	const iffam_p iffam = get_iffam_from_hook(priv, hook);
 
 	if (iffam == NULL)
-		panic(__func__);
+		panic("%s", __func__);
 	*get_hook_from_iffam(priv, iffam) = NULL;
 	return (0);
 }
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index 99f8641cdd45..fff7c28aa484 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -440,7 +440,7 @@ switch_on_etype:		etype = ntohs(*((const u_int16_t *)ptr));
 		mtod(m, u_char *)[7] = 0x07;
 		NG_FWD_NEW_DATA(error, item, priv->downlink, m);
 	} else
-		panic(__func__);
+		panic("%s", __func__);
 
 done:
 	if (item)
@@ -485,7 +485,7 @@ ng_rfc1490_disconnect(hook_p hook)
 	else if (hook == priv->ethernet)
 		priv->ethernet = NULL;
 	else
-		panic(__func__);
+		panic("%s", __func__);
 	return (0);
 }
 
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index 8080f6893442..50b53181e852 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -621,7 +621,7 @@ ng_detach_common(struct ngpcb *pcbp, int which)
 			priv->datasock = NULL;
 			break;
 		default:
-			panic(__func__);
+			panic("%s", __func__);
 		}
 		pcbp->sockdata = NULL;
 
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 84083170d8a2..492d21b8bfde 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -211,7 +211,7 @@ ngt_disconnect(hook_p hook)
 	const sc_p sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
 
 	if (hook != sc->hook)
-		panic(__func__);
+		panic("%s", __func__);
 
 	NGTLOCK(sc);
 	sc->hook = NULL;
@@ -317,7 +317,7 @@ ngt_rcvdata(hook_p hook, item_p item)
 	struct mbuf *m;
 
 	if (hook != sc->hook)
-		panic(__func__);
+		panic("%s", __func__);
 
 	NGI_GET_M(item, m);
 	NG_FREE_ITEM(item);