diff options
| author | phk <phk@FreeBSD.org> | 1997-10-12 20:26:33 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1997-10-12 20:26:33 +0000 |
| commit | 36e7a51ea1dedf0fc860ff3106aee1db1ab3b1f5 (patch) | |
| tree | e21c1d8330cbd5fba838afec549f8e4f0f66e451 /sys/netinet | |
| parent | 8ae70d2227594ff4a283453ca3cc3031eb78c14b (diff) | |
| download | FreeBSD-src-36e7a51ea1dedf0fc860ff3106aee1db1ab3b1f5.zip FreeBSD-src-36e7a51ea1dedf0fc860ff3106aee1db1ab3b1f5.tar.gz | |
Last major round (Unless Bruce thinks of somthing :-) of malloc changes.
Distribute all but the most fundamental malloc types. This time I also
remembered the trick to making things static: Put "static" in front of
them.
A couple of finer points by: bde
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/igmp.c | 4 | ||||
| -rw-r--r-- | sys/netinet/in.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_fw.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index a370843..8a4bd85 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)igmp.c 8.1 (Berkeley) 7/19/93 - * $Id: igmp.c,v 1.23 1997/09/16 11:43:50 bde Exp $ + * $Id: igmp.c,v 1.24 1997/10/11 18:31:31 phk Exp $ */ /* @@ -69,7 +69,7 @@ #include <netinet/igmp.h> #include <netinet/igmp_var.h> -MALLOC_DEFINE(M_MRTABLE, "mrt", "multicast routing tables"); +static MALLOC_DEFINE(M_MRTABLE, "mrt", "multicast routing tables"); static struct router_info * find_rti __P((struct ifnet *ifp)); diff --git a/sys/netinet/in.c b/sys/netinet/in.c index f06361a..da4a1e6 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.4 (Berkeley) 1/9/95 - * $Id: in.c,v 1.35 1997/08/02 14:32:49 bde Exp $ + * $Id: in.c,v 1.36 1997/10/11 18:31:31 phk Exp $ */ #include <sys/param.h> @@ -51,7 +51,7 @@ #include <netinet/igmp_var.h> -MALLOC_DEFINE(M_IPMADDR, "in_multi", "internet multicast address"); +static MALLOC_DEFINE(M_IPMADDR, "in_multi", "internet multicast address"); static void in_socktrim __P((struct sockaddr_in *)); static int in_ifinit __P((struct ifnet *, diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index 6f76bde..2151820 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -12,7 +12,7 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $Id: ip_fw.c,v 1.62 1997/08/23 14:28:22 alex Exp $ + * $Id: ip_fw.c,v 1.63 1997/09/10 03:07:14 peter Exp $ */ /* @@ -57,6 +57,8 @@ static int fw_verbose_limit = 0; LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain; +static MALLOC_DEFINE(M_IPFW, "IpFw/IpAcct", "IpFw/IpAcct chain's"); + #ifdef SYSCTL_NODE SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall"); SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, &fw_debug, 0, ""); diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 59276455..ef996c2 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $Id: ip_output.c,v 1.58 1997/08/02 14:32:53 bde Exp $ + * $Id: ip_output.c,v 1.59 1997/10/11 18:31:32 phk Exp $ */ #define _IP_VHL @@ -59,7 +59,7 @@ #endif #include <machine/in_cksum.h> -MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options"); +static MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options"); #if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1 #undef COMPAT_IPFW |
