Use a single style of multiple inclusion protection for Netgraph headers.

Reviewed by:	archie, harti, emax
This commit is contained in:
Ruslan Ermilov 2003-11-11 12:30:37 +00:00
parent a5ba2b5cc4
commit e20480bfb6
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=122481
32 changed files with 88 additions and 88 deletions

View File

@ -40,7 +40,7 @@
*/
#ifndef _NETGRAPH_NETGRAPH_H_
#define _NETGRAPH_NETGRAPH_H_ 1
#define _NETGRAPH_NETGRAPH_H_
#ifndef _KERNEL
#error "This file should not be included in user level programs"

View File

@ -40,8 +40,8 @@
* $Whistle: ng_UI.h,v 1.6 1999/01/20 00:54:15 archie Exp $
*/
#ifndef _NETGRAPH_UI_H_
#define _NETGRAPH_UI_H_
#ifndef _NETGRAPH_NG_UI_H_
#define _NETGRAPH_NG_UI_H_
/* Node type name and cookie */
#define NG_UI_NODE_TYPE "UI"
@ -51,5 +51,5 @@
#define NG_UI_HOOK_DOWNSTREAM "downstream"
#define NG_UI_HOOK_UPSTREAM "upstream"
#endif /* _NETGRAPH_UI_H_ */
#endif /* _NETGRAPH_NG_UI_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_async.h,v 1.5 1999/01/25 01:17:14 archie Exp $
*/
#ifndef _NETGRAPH_ASYNC_H_
#define _NETGRAPH_ASYNC_H_
#ifndef _NETGRAPH_NG_ASYNC_H_
#define _NETGRAPH_NG_ASYNC_H_
/* Type name and cookie */
#define NG_ASYNC_NODE_TYPE "async"
@ -106,4 +106,4 @@ enum {
NGM_ASYNC_CMD_GET_CONFIG, /* returns struct ng_async_cfg */
};
#endif /* _NETGRAPH_ASYNC_H_ */
#endif /* _NETGRAPH_NG_ASYNC_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_bpf.h,v 1.3 1999/12/03 20:30:23 archie Exp $
*/
#ifndef _NETGRAPH_BPF_H_
#define _NETGRAPH_BPF_H_
#ifndef _NETGRAPH_NG_BPF_H_
#define _NETGRAPH_NG_BPF_H_
/* Node type name and magic cookie */
#define NG_BPF_NODE_TYPE "bpf"
@ -99,4 +99,4 @@ enum {
NGM_BPF_GETCLR_STATS, /* supply name as char[NG_HOOKLEN+1] */
};
#endif /* _NETGRAPH_BPF_H_ */
#endif /* _NETGRAPH_NG_BPF_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_cisco.h,v 1.6 1999/01/25 01:21:48 archie Exp $
*/
#ifndef _NETGRAPH_CISCO_H_
#define _NETGRAPH_CISCO_H_
#ifndef _NETGRAPH_NG_CISCO_H_
#define _NETGRAPH_NG_CISCO_H_
/* Node type name and magic cookie */
#define NG_CISCO_NODE_TYPE "cisco"
@ -86,5 +86,5 @@ struct ng_cisco_stats {
{ NULL } \
}
#endif /* _NETGRAPH_CISCO_H_ */
#endif /* _NETGRAPH_NG_CISCO_H_ */

View File

@ -28,8 +28,8 @@
*
*/
#ifndef _NETGRAPH_DEVICE_H_
#define _NETGRAPH_DEVICE_H_
#ifndef _NETGRAPH_NG_DEVICE_H_
#define _NETGRAPH_NG_DEVICE_H_
/* Node type name and magic cookie */
#define NG_DEVICE_NODE_TYPE "device"
@ -41,4 +41,4 @@ struct ngd_param_s {
};
#endif /* _NETGRAPH_DEVICE_H_ */
#endif /* _NETGRAPH_NG_DEVICE_H_ */

View File

@ -40,11 +40,11 @@
* $Whistle: ng_echo.h,v 1.3 1999/01/20 00:22:12 archie Exp $
*/
#ifndef _NETGRAPH_ECHO_H_
#define _NETGRAPH_ECHO_H_
#ifndef _NETGRAPH_NG_ECHO_H_
#define _NETGRAPH_NG_ECHO_H_
/* Node type name and magic cookie */
#define NG_ECHO_NODE_TYPE "echo"
#define NGM_ECHO_COOKIE 884298942
#endif /* _NETGRAPH_ECHO_H_ */
#endif /* _NETGRAPH_NG_ECHO_H_ */

View File

@ -29,8 +29,8 @@
* $FreeBSD$
*/
#ifndef _NETGRAPH_EIFACE_H_
#define _NETGRAPH_EIFACE_H_
#ifndef _NETGRAPH_NG_EIFACE_H_
#define _NETGRAPH_NG_EIFACE_H_
/* Node type name and magic cookie */
#define NG_EIFACE_NODE_TYPE "eiface"
@ -79,4 +79,4 @@ struct ng_eiface_par {
{ NULL } \
}
#endif /* _NETGRAPH_EIFACE_H_ */
#endif /* _NETGRAPH_NG_EIFACE_H_ */

View File

@ -31,8 +31,8 @@
* $FreeBSD$
*/
#ifndef _NETGRAPH_ETHERTYPE_FILTER_H_
#define _NETGRAPH_ETHERTYPE_FILTER_H_
#ifndef _NETGRAPH_NG_ETF_H_
#define _NETGRAPH_NG_ETF_H_
/* Node type name. This should be unique among all netgraph node types */
#define NG_ETF_NODE_TYPE "etf"
@ -85,4 +85,4 @@ struct ng_etffilter {
{ NULL } \
}
#endif /* _NETGRAPH_ETHERTYPE_FILTER_H_ */
#endif /* _NETGRAPH_NG_ETF_H_ */

View File

@ -72,8 +72,8 @@
* $Whistle: ng_fec.h,v 1.5 1999/01/20 00:22:13 archie Exp $
*/
#ifndef _NETGRAPH_FEC_H_
#define _NETGRAPH_FEC_H_
#ifndef _NETGRAPH_NG_FEC_H_
#define _NETGRAPH_NG_FEC_H_
#define NETISR_FEC 26
@ -108,4 +108,4 @@ struct ng_fec_ifname {
char ngif_name[NG_FEC_FEC_NAME_MAX + 1];
};
#endif /* _NETGRAPH_FEC_H_ */
#endif /* _NETGRAPH_NG_FEC_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_frame_relay.h,v 1.7 1999/01/20 00:22:13 archie Exp $
*/
#ifndef _NETGRAPH_FRAME_RELAY_H_
#define _NETGRAPH_FRAME_RELAY_H_
#ifndef _NETGRAPH_NG_FRAME_RELAY_H_
#define _NETGRAPH_NG_FRAME_RELAY_H_
/* Node type name and magic cookie */
#define NG_FRAMERELAY_NODE_TYPE "frame_relay"
@ -52,4 +52,4 @@
#define NG_FRAMERELAY_HOOK_DOWNSTREAM "downstream"
#define NG_FRAMERELAY_HOOK_DLCI "dlci" /* really just the prefix */
#endif /* _NETGRAPH_FRAME_RELAY_H_ */
#endif /* _NETGRAPH_NG_FRAME_RELAY_H_ */

View File

@ -40,11 +40,11 @@
* $Whistle: ng_hole.h,v 1.3 1999/01/20 00:22:13 archie Exp $
*/
#ifndef _NETGRAPH_HOLE_H_
#define _NETGRAPH_HOLE_H_
#ifndef _NETGRAPH_NG_HOLE_H_
#define _NETGRAPH_NG_HOLE_H_
/* Node type name and magic cookie */
#define NG_HOLE_NODE_TYPE "hole"
#define NGM_HOLE_COOKIE 915433206
#endif /* _NETGRAPH_HOLE_H_ */
#endif /* _NETGRAPH_NG_HOLE_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_iface.h,v 1.5 1999/01/20 00:22:13 archie Exp $
*/
#ifndef _NETGRAPH_IFACE_H_
#define _NETGRAPH_IFACE_H_
#ifndef _NETGRAPH_NG_IFACE_H_
#define _NETGRAPH_NG_IFACE_H_
/* Node type name and magic cookie */
#define NG_IFACE_NODE_TYPE "iface"
@ -75,4 +75,4 @@ struct ng_iface_ifname {
char ngif_name[NG_IFACE_IFACE_NAME_MAX + 1];
};
#endif /* _NETGRAPH_IFACE_H_ */
#endif /* _NETGRAPH_NG_IFACE_H_ */

View File

@ -65,11 +65,11 @@
* $FreeBSD$
*/
#ifndef _NETGRAPH_IP_INPUT_H_
#define _NETGRAPH_IP_INPUT_H_
#ifndef _NETGRAPH_NG_IP_INPUT_H_
#define _NETGRAPH_NG_IP_INPUT_H_
/* Node type name and magic cookie */
#define NG_IP_INPUT_NODE_TYPE "ip_input"
#define NGM_IP_INPUT_COOKIE 994874907
#endif /* _NETGRAPH_IP_INPUT_H_ */
#endif /* _NETGRAPH_NG_IP_INPUT_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_ksocket.h,v 1.1 1999/11/16 20:04:40 archie Exp $
*/
#ifndef _NETGRAPH_KSOCKET_H_
#define _NETGRAPH_KSOCKET_H_
#ifndef _NETGRAPH_NG_KSOCKET_H_
#define _NETGRAPH_NG_KSOCKET_H_
#include <sys/socket.h>
@ -97,4 +97,4 @@ enum {
/* Meta information ID's */
#define NG_KSOCKET_META_SOCKADDR 1 /* data is struct sockaddr */
#endif /* _NETGRAPH_KSOCKET_H_ */
#endif /* _NETGRAPH_NG_KSOCKET_H_ */

View File

@ -40,8 +40,8 @@
* $FreeBSD$
*/
#ifndef _NETGRAPH_L2TP_H_
#define _NETGRAPH_L2TP_H_
#ifndef _NETGRAPH_NG_L2TP_H_
#define _NETGRAPH_NG_L2TP_H_
/* Node type name and magic cookie */
#define NG_L2TP_NODE_TYPE "l2tp"
@ -158,4 +158,4 @@ enum {
NGM_L2TP_ACK_FAILURE, /* sent *from* node after ack timeout */
};
#endif /* _NETGRAPH_L2TP_H_ */
#endif /* _NETGRAPH_NG_L2TP_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_lmi.h,v 1.9 1999/01/20 00:22:13 archie Exp $
*/
#ifndef _NETGRAPH_LMI_H_
#define _NETGRAPH_LMI_H_
#ifndef _NETGRAPH_NG_LMI_H_
#define _NETGRAPH_NG_LMI_H_
/* Node type name and magic cookie */
#define NG_LMI_NODE_TYPE "lmi"
@ -77,4 +77,4 @@ struct nglmistat {
#define NG_LMI_SEQ_PER_FULL 5 /* keepalives per full status */
#define NG_LMI_LMI_PRIORITY 64 /* priority for LMI data */
#endif /* _NETGRAPH_LMI_H_ */
#endif /* _NETGRAPH_NG_LMI_H_ */

View File

@ -41,7 +41,7 @@
*/
#ifndef _NETGRAPH_NG_MESSAGE_H_
#define _NETGRAPH_NG_MESSAGE_H_ 1
#define _NETGRAPH_NG_MESSAGE_H_
/* ASCII string size limits */
#define NG_TYPELEN 15 /* max type name len (16 with null) */

View File

@ -40,8 +40,8 @@
* $FreeBSD$
*/
#ifndef _NETGRAPH_MPPC_H_
#define _NETGRAPH_MPPC_H_
#ifndef _NETGRAPH_NG_MPPC_H_
#define _NETGRAPH_NG_MPPC_H_
/* Node type name and magic cookie */
#define NG_MPPC_NODE_TYPE "mppc"
@ -80,5 +80,5 @@ enum {
NGM_MPPC_RESETREQ, /* sent either way! */
};
#endif /* _NETGRAPH_MPPC_H_ */
#endif /* _NETGRAPH_NG_MPPC_H_ */

View File

@ -40,8 +40,8 @@
* $FreeBSD$
*/
#ifndef _NETGRAPH_PARSE_H_
#define _NETGRAPH_PARSE_H_
#ifndef _NETGRAPH_NG_PARSE_H_
#define _NETGRAPH_NG_PARSE_H_
/*
@ -527,5 +527,5 @@ extern char *ng_get_string_token(const char *s, int *startp,
*/
extern char *ng_encode_string(const char *s, int slen);
#endif /* _NETGRAPH_PARSE_H_ */
#endif /* _NETGRAPH_NG_PARSE_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_ppp.h,v 1.8 1999/01/25 02:40:02 archie Exp $
*/
#ifndef _NETGRAPH_PPP_H_
#define _NETGRAPH_PPP_H_
#ifndef _NETGRAPH_NG_PPP_H_
#define _NETGRAPH_NG_PPP_H_
/* Node type name and magic cookie */
#define NG_PPP_NODE_TYPE "ppp"
@ -197,4 +197,4 @@ struct ng_ppp_link_stat {
{ NULL } \
}
#endif /* _NETGRAPH_PPP_H_ */
#endif /* _NETGRAPH_NG_PPP_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_pppoe.h,v 1.7 1999/10/16 10:16:43 julian Exp $
*/
#ifndef _NETGRAPH_PPPOE_H_
#define _NETGRAPH_PPPOE_H_
#ifndef _NETGRAPH_NG_PPPOE_H_
#define _NETGRAPH_NG_PPPOE_H_
/********************************************************************
* Netgraph hook constants etc.
@ -248,5 +248,5 @@ struct datatag {
#define TAGS_HUNIQ 3
/* for PADT */
#endif /* _NETGRAPH_PPPOE_H_ */
#endif /* _NETGRAPH_NG_PPPOE_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_pptpgre.h,v 1.3 1999/12/08 00:11:36 archie Exp $
*/
#ifndef _NETGRAPH_PPTPGRE_H_
#define _NETGRAPH_PPTPGRE_H_
#ifndef _NETGRAPH_NG_PPTPGRE_H_
#define _NETGRAPH_NG_PPTPGRE_H_
/* Node type name and magic cookie */
#define NG_PPTPGRE_NODE_TYPE "pptpgre"
@ -125,4 +125,4 @@ enum {
NGM_PPTPGRE_GETCLR_STATS, /* returns & clears stats */
};
#endif /* _NETGRAPH_PPTPGRE_H_ */
#endif /* _NETGRAPH_NG_PPTPGRE_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_rfc1490.h,v 1.7 1999/01/20 00:54:15 archie Exp $
*/
#ifndef _NETGRAPH_RFC1490_H_
#define _NETGRAPH_RFC1490_H_
#ifndef _NETGRAPH_NG_RFC1490_H_
#define _NETGRAPH_NG_RFC1490_H_
/* Node type name */
#define NG_RFC1490_NODE_TYPE "rfc1490"
@ -52,4 +52,4 @@
#define NG_RFC1490_HOOK_INET "inet"
#define NG_RFC1490_HOOK_PPP "ppp"
#endif /* _NETGRAPH_RFC1490_H_ */
#endif /* _NETGRAPH_NG_RFC1490_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_sample.h,v 1.3 1999/01/20 00:22:14 archie Exp $
*/
#ifndef _NETGRAPH_SAMPLE_H_
#define _NETGRAPH_SAMPLE_H_
#ifndef _NETGRAPH_NG_SAMPLE_H_
#define _NETGRAPH_NG_SAMPLE_H_
/* Node type name. This should be unique among all netgraph node types */
#define NG_XXX_NODE_TYPE "sample"
@ -85,4 +85,4 @@ struct ngxxxstat {
{ NULL } \
}
#endif /* _NETGRAPH_SAMPLE_H_ */
#endif /* _NETGRAPH_NG_SAMPLE_H_ */

View File

@ -41,7 +41,7 @@
*/
#ifndef _NETGRAPH_NG_SOCKET_H_
#define _NETGRAPH_NG_SOCKET_H_ 1
#define _NETGRAPH_NG_SOCKET_H_
/* Netgraph node type name and cookie */
#define NG_SOCKET_NODE_TYPE "socket"

View File

@ -41,7 +41,7 @@
*/
#ifndef _NETGRAPH_NG_SOCKETVAR_H_
#define _NETGRAPH_NG_SOCKETVAR_H_ 1
#define _NETGRAPH_NG_SOCKETVAR_H_
/* Netgraph protocol control block for each socket */
struct ngpcb {

View File

@ -46,8 +46,8 @@ EXEMPLARY,
* $FreeBSD$
*/
#ifndef _NETGRAPH_SOURCE_H_
#define _NETGRAPH_SOURCE_H_
#ifndef _NETGRAPH_NG_SOURCE_H_
#define _NETGRAPH_NG_SOURCE_H_
/* Node type name and magic cookie */
#define NG_SOURCE_NODE_TYPE "source"
@ -91,4 +91,4 @@ enum {
NGM_SOURCE_CLR_DATA, /* clear the queued data */
};
#endif /* _NETGRAPH_SOURCE_H_ */
#endif /* _NETGRAPH_NG_SOURCE_H_ */

View File

@ -30,8 +30,8 @@
*/
#ifndef _NG_SPLIT_H
#define _NG_SPLIT_H
#ifndef _NETGRAPH_NG_SPLIT_H_
#define _NETGRAPH_NG_SPLIT_H_
/* Node type name and magic cookie */
#define NG_SPLIT_NODE_TYPE "split"
@ -42,4 +42,4 @@
#define NG_SPLIT_HOOK_OUT "out" /* Output to outhook (sending out) */
#define NG_SPLIT_HOOK_IN "in" /* Input from inhook (recieving) */
#endif /* _NG_SPLIT_H */
#endif /* _NETGRAPH_NG_SPLIT_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_tee.h,v 1.2 1999/01/20 00:22:14 archie Exp $
*/
#ifndef _NETGRAPH_TEE_H_
#define _NETGRAPH_TEE_H_
#ifndef _NETGRAPH_NG_TEE_H_
#define _NETGRAPH_NG_TEE_H_
/* Node type name and magic cookie */
#define NG_TEE_NODE_TYPE "tee"
@ -94,4 +94,4 @@ enum {
NGM_TEE_GETCLR_STATS, /* atomically get and clear stats */
};
#endif /* _NETGRAPH_TEE_H_ */
#endif /* _NETGRAPH_NG_TEE_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_tty.h,v 1.7 1999/01/20 00:22:15 archie Exp $
*/
#ifndef _NETGRAPH_TTY_H_
#define _NETGRAPH_TTY_H_
#ifndef _NETGRAPH_NG_TTY_H_
#define _NETGRAPH_NG_TTY_H_
/* Node type name and magic cookie */
#define NG_TTY_NODE_TYPE "tty"
@ -59,4 +59,4 @@ enum {
NGM_TTY_SET_HOTCHAR,
};
#endif /* _NETGRAPH_TTY_H_ */
#endif /* _NETGRAPH_NG_TTY_H_ */

View File

@ -40,8 +40,8 @@
* $Whistle: ng_vjc.h,v 1.6 1999/01/25 02:40:22 archie Exp $
*/
#ifndef _NETGRAPH_VJC_H_
#define _NETGRAPH_VJC_H_
#ifndef _NETGRAPH_NG_VJC_H_
#define _NETGRAPH_NG_VJC_H_
/* Node type name and magic cookie */
#define NG_VJC_NODE_TYPE "vjc"
@ -83,4 +83,4 @@ enum {
NGM_VJC_RECV_ERROR, /* Indicate loss of incoming frame */
};
#endif /* _NETGRAPH_VJC_H_ */
#endif /* _NETGRAPH_NG_VJC_H_ */