From owner-svn-src-all@FreeBSD.ORG Wed Oct 13 17:21:22 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09CE1106566C; Wed, 13 Oct 2010 17:21:22 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC5088FC08; Wed, 13 Oct 2010 17:21:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9DHLL0B094582; Wed, 13 Oct 2010 17:21:21 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9DHLL9M094573; Wed, 13 Oct 2010 17:21:21 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201010131721.o9DHLL9M094573@svn.freebsd.org> From: Rui Paulo Date: Wed, 13 Oct 2010 17:21:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213794 - head/sys/netgraph X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 17:21:22 -0000 Author: rpaulo Date: Wed Oct 13 17:21:21 2010 New Revision: 213794 URL: http://svn.freebsd.org/changeset/base/213794 Log: When calling panic(), always pass a format string. Modified: head/sys/netgraph/ng_UI.c head/sys/netgraph/ng_async.c head/sys/netgraph/ng_frame_relay.c head/sys/netgraph/ng_gif_demux.c head/sys/netgraph/ng_iface.c head/sys/netgraph/ng_rfc1490.c head/sys/netgraph/ng_socket.c head/sys/netgraph/ng_tty.c Modified: head/sys/netgraph/ng_UI.c ============================================================================== --- head/sys/netgraph/ng_UI.c Wed Oct 13 17:17:50 2010 (r213793) +++ head/sys/netgraph/ng_UI.c Wed Oct 13 17:21:21 2010 (r213794) @@ -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. Modified: head/sys/netgraph/ng_async.c ============================================================================== --- head/sys/netgraph/ng_async.c Wed Oct 13 17:17:50 2010 (r213793) +++ head/sys/netgraph/ng_async.c Wed Oct 13 17:21:21 2010 (r213794) @@ -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; Modified: head/sys/netgraph/ng_frame_relay.c ============================================================================== --- head/sys/netgraph/ng_frame_relay.c Wed Oct 13 17:17:50 2010 (r213793) +++ head/sys/netgraph/ng_frame_relay.c Wed Oct 13 17:21:21 2010 (r213794) @@ -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 */ Modified: head/sys/netgraph/ng_gif_demux.c ============================================================================== --- head/sys/netgraph/ng_gif_demux.c Wed Oct 13 17:17:50 2010 (r213793) +++ head/sys/netgraph/ng_gif_demux.c Wed Oct 13 17:21:21 2010 (r213794) @@ -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; } Modified: head/sys/netgraph/ng_iface.c ============================================================================== --- head/sys/netgraph/ng_iface.c Wed Oct 13 17:17:50 2010 (r213793) +++ head/sys/netgraph/ng_iface.c Wed Oct 13 17:21:21 2010 (r213794) @@ -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); } Modified: head/sys/netgraph/ng_rfc1490.c ============================================================================== --- head/sys/netgraph/ng_rfc1490.c Wed Oct 13 17:17:50 2010 (r213793) +++ head/sys/netgraph/ng_rfc1490.c Wed Oct 13 17:21:21 2010 (r213794) @@ -440,7 +440,7 @@ switch_on_etype: etype = ntohs(*((const 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); } Modified: head/sys/netgraph/ng_socket.c ============================================================================== --- head/sys/netgraph/ng_socket.c Wed Oct 13 17:17:50 2010 (r213793) +++ head/sys/netgraph/ng_socket.c Wed Oct 13 17:21:21 2010 (r213794) @@ -621,7 +621,7 @@ ng_detach_common(struct ngpcb *pcbp, int priv->datasock = NULL; break; default: - panic(__func__); + panic("%s", __func__); } pcbp->sockdata = NULL; Modified: head/sys/netgraph/ng_tty.c ============================================================================== --- head/sys/netgraph/ng_tty.c Wed Oct 13 17:17:50 2010 (r213793) +++ head/sys/netgraph/ng_tty.c Wed Oct 13 17:21:21 2010 (r213794) @@ -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);