diff options
Diffstat (limited to 'sys/netgraph/ng_ksocket.c')
-rw-r--r-- | sys/netgraph/ng_ksocket.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 43364f194ddf..312b5ef61a04 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -250,17 +250,17 @@ ng_ksocket_sockaddr_parse(const struct ng_parse_type *type, return (EINVAL); pathlen = strlen(path); if (pathlen > SOCK_MAXADDRLEN) { - FREE(path, M_NETGRAPH_KSOCKET); + free(path, M_NETGRAPH_KSOCKET); return (E2BIG); } if (*buflen < pathoff + pathlen) { - FREE(path, M_NETGRAPH_KSOCKET); + free(path, M_NETGRAPH_KSOCKET); return (ERANGE); } *off += toklen; bcopy(path, sun->sun_path, pathlen); sun->sun_len = pathoff + pathlen; - FREE(path, M_NETGRAPH_KSOCKET); + free(path, M_NETGRAPH_KSOCKET); break; } @@ -335,7 +335,7 @@ ng_ksocket_sockaddr_unparse(const struct ng_parse_type *type, if ((pathtoken = ng_encode_string(pathbuf, pathlen)) == NULL) return (ENOMEM); slen += snprintf(cbuf, cbuflen, "local/%s", pathtoken); - FREE(pathtoken, M_NETGRAPH_KSOCKET); + free(pathtoken, M_NETGRAPH_KSOCKET); if (slen >= cbuflen) return (ERANGE); *off += sun->sun_len; @@ -523,7 +523,7 @@ ng_ksocket_constructor(node_p node) priv_p priv; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), + priv = malloc(sizeof(*priv), M_NETGRAPH_KSOCKET, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -811,7 +811,7 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) bail: /* Cleanup */ if (sa != NULL) - FREE(sa, M_SONAME); + free(sa, M_SONAME); break; } @@ -965,7 +965,7 @@ ng_ksocket_shutdown(node_p node) /* Take down netgraph node */ bzero(priv, sizeof(*priv)); - FREE(priv, M_NETGRAPH_KSOCKET); + free(priv, M_NETGRAPH_KSOCKET); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); /* let the node escape */ return (0); @@ -1105,7 +1105,7 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2) /* See if we got anything */ if (m == NULL) { if (sa != NULL) - FREE(sa, M_SONAME); + free(sa, M_SONAME); break; } @@ -1130,11 +1130,11 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2) NG_KSOCKET_TAG_SOCKADDR, sizeof(ng_ID_t) + sa->sa_len, M_NOWAIT); if (stag == NULL) { - FREE(sa, M_SONAME); + free(sa, M_SONAME); goto sendit; } bcopy(sa, &stag->sa, sa->sa_len); - FREE(sa, M_SONAME); + free(sa, M_SONAME); stag->id = NG_NODE_ID(node); m_tag_prepend(m, &stag->tag); } @@ -1234,14 +1234,14 @@ ng_ksocket_finish_accept(priv_p priv) /* Clone a ksocket node to wrap the new socket */ error = ng_make_node_common(&ng_ksocket_typestruct, &node); if (error) { - FREE(resp, M_NETGRAPH); + free(resp, M_NETGRAPH); soclose(so); goto out; } if (ng_ksocket_constructor(node) != 0) { NG_NODE_UNREF(node); - FREE(resp, M_NETGRAPH); + free(resp, M_NETGRAPH); soclose(so); goto out; } @@ -1276,7 +1276,7 @@ ng_ksocket_finish_accept(priv_p priv) out: if (sa != NULL) - FREE(sa, M_SONAME); + free(sa, M_SONAME); } /* |