From owner-freebsd-net@FreeBSD.ORG Mon Aug 8 19:46:50 2005 Return-Path: X-Original-To: freebsd-net@freebsd.org Delivered-To: freebsd-net@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 42C3B16A41F for ; Mon, 8 Aug 2005 19:46:50 +0000 (GMT) (envelope-from emaste@phaedrus.sandvine.ca) Received: from mailserver.sandvine.com (sandvine.com [199.243.201.138]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61CCC43D46 for ; Mon, 8 Aug 2005 19:46:49 +0000 (GMT) (envelope-from emaste@phaedrus.sandvine.ca) Received: from labgw2.phaedrus.sandvine.com ([192.168.3.11]) by mailserver.sandvine.com with Microsoft SMTPSVC(5.0.2195.6713); Mon, 8 Aug 2005 15:46:48 -0400 Received: by labgw2.phaedrus.sandvine.com (Postfix, from userid 12627) id 5724813633; Mon, 8 Aug 2005 15:46:48 -0400 (EDT) Date: Mon, 8 Aug 2005 15:46:48 -0400 From: Ed Maste To: freebsd-net@freebsd.org Message-ID: <20050808194648.GB4843@sandvine.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="s/l3CgOIzMHHjg/5" Content-Disposition: inline User-Agent: Mutt/1.4.2.1i X-OriginalArrivalTime: 08 Aug 2005 19:46:48.0510 (UTC) FILETIME=[EA2E15E0:01C59C51] Subject: [PATCH] Minor cleanup of inline declaration for netgraph.h X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 19:46:50 -0000 --s/l3CgOIzMHHjg/5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline We build one of our netgraph modules with -W, which causes GCC to emit "warning: `inline' is not at beginning of declaration" for netgraph.h. It's pretty trivial, but the attached patch cleans this up so it's consistent across all of the functions in netgraph.h. -- Ed Maste, Sandvine Incorporated --s/l3CgOIzMHHjg/5 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="netgraph.h.patch" Index: sys/netgraph/netgraph.h =================================================================== RCS file: /usr/cvs/src/sys/netgraph/netgraph.h,v retrieving revision 1.58 diff -u -3 -r1.58 netgraph.h --- sys/netgraph/netgraph.h 2 Aug 2005 20:06:48 -0000 1.58 +++ sys/netgraph/netgraph.h 8 Aug 2005 19:31:07 -0000 @@ -175,7 +175,7 @@ int line); static __inline void _ng_hook_force_queue(hook_p hook, char * file, int line); -static void __inline +static __inline void _chkhook(hook_p hook, char *file, int line) { if (hook->hk_magic != HK_MAGIC) { @@ -407,7 +407,7 @@ #ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ void dumpnode(node_p node, char *file, int line); -static void __inline _chknode(node_p node, char *file, int line); +static __inline void _chknode(node_p node, char *file, int line); static __inline char * _ng_node_name(node_p node, char *file, int line); static __inline int _ng_node_has_name(node_p node, char *file, int line); static __inline ng_ID_t _ng_node_id(node_p node, char *file, int line); @@ -425,7 +425,7 @@ ng_fn_eachhook *fn, void *arg, char *file, int line); static __inline void _ng_node_revive(node_p node, char *file, int line); -static void __inline +static __inline void _chknode(node_p node, char *file, int line) { if (node->nd_magic != ND_MAGIC) { --s/l3CgOIzMHHjg/5--