diff options
| author | des <des@FreeBSD.org> | 2008-10-23 20:26:15 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2008-10-23 20:26:15 +0000 |
| commit | a1e1ad22e07d384a9609e60cdf00daf7cac902cf (patch) | |
| tree | 8c9f9efa0a9f52794e2ce1fe47128f50d30f8c28 /sys/netinet | |
| parent | 0b81365bc66eb70b9d9b1466012b41f8ccdec19a (diff) | |
| download | FreeBSD-src-a1e1ad22e07d384a9609e60cdf00daf7cac902cf.zip FreeBSD-src-a1e1ad22e07d384a9609e60cdf00daf7cac902cf.tar.gz | |
Fix a number of style issues in the MALLOC / FREE commit. I've tried to
be careful not to fix anything that was already broken; the NFSv4 code is
particularly bad in this respect.
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/in_mcast.c | 10 | ||||
| -rw-r--r-- | sys/netinet/tcp_syncache.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index 16d92ce..65e6be8 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -817,7 +817,7 @@ inp_get_source_filters(struct inpcb *inp, struct sockopt *sopt) * has asked for, but we always tell userland how big the * buffer really needs to be. */ - tss = malloc( sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, + tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, M_TEMP, M_NOWAIT); if (tss == NULL) { error = ENOBUFS; @@ -1569,7 +1569,7 @@ inp_set_source_filters(struct inpcb *inp, struct sockopt *sopt) * that we may copy them with a single copyin. This * allows us to deal with page faults up-front. */ - kss = malloc( sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, + kss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, M_TEMP, M_WAITOK); error = copyin(msfr.msfr_srcs, kss, sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs); @@ -1623,7 +1623,7 @@ inp_set_source_filters(struct inpcb *inp, struct sockopt *sopt) * entries we are about to allocate, in case we * abruptly need to free them. */ - pnims = malloc( sizeof(struct in_msource *) * msfr.msfr_nsrcs, + pnims = malloc(sizeof(struct in_msource *) * msfr.msfr_nsrcs, M_TEMP, M_WAITOK | M_ZERO); /* @@ -1634,8 +1634,8 @@ inp_set_source_filters(struct inpcb *inp, struct sockopt *sopt) pkss = kss; nims = NULL; for (i = 0; i < msfr.msfr_nsrcs; i++, pkss++) { - nims = malloc( sizeof(struct in_msource) * msfr.msfr_nsrcs, - M_IPMSOURCE, M_WAITOK | M_ZERO); + nims = malloc(sizeof(struct in_msource) * + msfr.msfr_nsrcs, M_IPMSOURCE, M_WAITOK | M_ZERO); pnims[i] = nims; } if (i < msfr.msfr_nsrcs) { diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index d81a24e..19c5b7e 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -247,8 +247,8 @@ syncache_init(void) &V_tcp_syncache.cache_limit); /* Allocate the hash table. */ - V_tcp_syncache.hashbase = malloc( V_tcp_syncache.hashsize * sizeof(struct syncache_head), - M_SYNCACHE, M_WAITOK | M_ZERO); + V_tcp_syncache.hashbase = malloc(V_tcp_syncache.hashsize * + sizeof(struct syncache_head), M_SYNCACHE, M_WAITOK | M_ZERO); /* Initialize the hash buckets. */ for (i = 0; i < V_tcp_syncache.hashsize; i++) { |
