diff options
author | ed <ed@FreeBSD.org> | 2011-11-07 06:44:47 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2011-11-07 06:44:47 +0000 |
commit | e97eae1577f10887cddd14c0c954b3ddcf507bd6 (patch) | |
tree | 3278fb8afc568f22cc5eda0e74926191fc1857df /sys/net | |
parent | dcf961c021321caf2c6fda15125c85b82ec9ff04 (diff) | |
download | FreeBSD-src-e97eae1577f10887cddd14c0c954b3ddcf507bd6.zip FreeBSD-src-e97eae1577f10887cddd14c0c954b3ddcf507bd6.tar.gz |
Mark MALLOC_DEFINEs static that have no corresponding MALLOC_DECLAREs.
This means that their use is restricted to a single C file.
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/if.c | 4 | ||||
-rw-r--r-- | sys/net/if_arcsubr.c | 2 | ||||
-rw-r--r-- | sys/net/if_atmsubr.c | 2 | ||||
-rw-r--r-- | sys/net/if_ethersubr.c | 2 | ||||
-rw-r--r-- | sys/net/if_fwsubr.c | 2 | ||||
-rw-r--r-- | sys/net/if_iso88025subr.c | 2 | ||||
-rw-r--r-- | sys/net/if_spppsubr.c | 2 | ||||
-rw-r--r-- | sys/net/vnet.c | 7 |
8 files changed, 12 insertions, 11 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 2b7a24a..322759a 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -118,7 +118,7 @@ SYSCTL_UINT(_net, OID_AUTO, ifdescr_maxlen, CTLFLAG_RW, &ifdescr_maxlen, 0, "administrative maximum length for interface description"); -MALLOC_DEFINE(M_IFDESCR, "ifdescr", "ifnet descriptions"); +static MALLOC_DEFINE(M_IFDESCR, "ifdescr", "ifnet descriptions"); /* global sx for non-critical path ifdescr */ static struct sx ifdescr_sx; @@ -215,7 +215,7 @@ struct sx ifnet_sxlock; static if_com_alloc_t *if_com_alloc[256]; static if_com_free_t *if_com_free[256]; -MALLOC_DEFINE(M_IFNET, "ifnet", "interface internals"); +static MALLOC_DEFINE(M_IFNET, "ifnet", "interface internals"); MALLOC_DEFINE(M_IFADDR, "ifaddr", "interface address"); MALLOC_DEFINE(M_IFMADDR, "ether_multi", "link-level multicast address"); diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index 2a58d5a..03f3a1c 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -837,7 +837,7 @@ arc_resolvemulti(struct ifnet *ifp, struct sockaddr **llsa, } } -MALLOC_DEFINE(M_ARCCOM, "arccom", "ARCNET interface internals"); +static MALLOC_DEFINE(M_ARCCOM, "arccom", "ARCNET interface internals"); static void* arc_alloc(u_char type, struct ifnet *ifp) diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index fb63fd5..bb691e1 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -98,7 +98,7 @@ void (*atm_harp_event_p)(struct ifnet *, uint32_t, void *); SYSCTL_NODE(_hw, OID_AUTO, atm, CTLFLAG_RW, 0, "ATM hardware"); -MALLOC_DEFINE(M_IFATM, "ifatm", "atm interface internals"); +static MALLOC_DEFINE(M_IFATM, "ifatm", "atm interface internals"); #ifndef ETHERTYPE_IPV6 #define ETHERTYPE_IPV6 0x86dd diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 1d16ae6..9eae683 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -134,7 +134,7 @@ static void ether_reassign(struct ifnet *, struct vnet *, char *); #endif /* XXX: should be in an arp support file, not here */ -MALLOC_DEFINE(M_ARPCOM, "arpcom", "802.* interface internals"); +static MALLOC_DEFINE(M_ARPCOM, "arpcom", "802.* interface internals"); #define ETHER_IS_BROADCAST(addr) \ (bcmp(etherbroadcastaddr, (addr), ETHER_ADDR_LEN) == 0) diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index 7c57feb..5414d79 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -63,7 +63,7 @@ #include <security/mac/mac_framework.h> -MALLOC_DEFINE(M_FWCOM, "fw_com", "firewire interface internals"); +static MALLOC_DEFINE(M_FWCOM, "fw_com", "firewire interface internals"); struct fw_hwaddr firewire_broadcastaddr = { 0xffffffff, diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c index 7961df0..91d67fd 100644 --- a/sys/net/if_iso88025subr.c +++ b/sys/net/if_iso88025subr.c @@ -781,7 +781,7 @@ iso88025_resolvemulti (ifp, llsa, sa) return (0); } -MALLOC_DEFINE(M_ISO88025, "arpcom", "802.5 interface internals"); +static MALLOC_DEFINE(M_ISO88025, "arpcom", "802.5 interface internals"); static void* iso88025_alloc(u_char type, struct ifnet *ifp) diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 363d9aa..7c9c230 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -174,7 +174,7 @@ #define STATE_ACK_SENT 8 #define STATE_OPENED 9 -MALLOC_DEFINE(M_SPPP, "sppp", "synchronous PPP interface internals"); +static MALLOC_DEFINE(M_SPPP, "sppp", "synchronous PPP interface internals"); struct ppp_header { u_char address; diff --git a/sys/net/vnet.c b/sys/net/vnet.c index b9eebd9..e8864aa 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$"); FEATURE(vimage, "VIMAGE kernel virtualization"); -MALLOC_DEFINE(M_VNET, "vnet", "network stack control block"); +static MALLOC_DEFINE(M_VNET, "vnet", "network stack control block"); /* * The virtual network stack list has two read-write locks, one sleepable and @@ -161,7 +161,7 @@ struct vnet *vnet0; */ #define VNET_BYTES (VNET_STOP - VNET_START) -MALLOC_DEFINE(M_VNET_DATA, "vnet_data", "VNET data"); +static MALLOC_DEFINE(M_VNET_DATA, "vnet_data", "VNET data"); /* * VNET_MODMIN is the minimum number of bytes we will reserve for the sum of @@ -203,7 +203,8 @@ struct vnet_data_free { TAILQ_ENTRY(vnet_data_free) vnd_link; }; -MALLOC_DEFINE(M_VNET_DATA_FREE, "vnet_data_free", "VNET resource accounting"); +static MALLOC_DEFINE(M_VNET_DATA_FREE, "vnet_data_free", + "VNET resource accounting"); static TAILQ_HEAD(, vnet_data_free) vnet_data_free_head = TAILQ_HEAD_INITIALIZER(vnet_data_free_head); static struct sx vnet_data_free_lock; |