aboutsummaryrefslogtreecommitdiff
path: root/sys/net/radix.c
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <loos@FreeBSD.org>2015-07-30 02:09:03 +0000
committerLuiz Otavio O Souza <loos@FreeBSD.org>2015-07-30 02:09:03 +0000
commit8b15f615e03e05781e90e8def1cb585a43b16664 (patch)
tree4c60d9268b0324461c61d65d01267d3601b06195 /sys/net/radix.c
parent48cae112b516ce625d38f22fdc07a29d509de845 (diff)
downloadsrc-8b15f615e03e05781e90e8def1cb585a43b16664.tar.gz
src-8b15f615e03e05781e90e8def1cb585a43b16664.zip
Follow r256586 and rename the kernel version of the Free() macro to
R_Free(). This matches the other macros and reduces the chances to clash with other headers. This also fixes the build of radix.c outside of the kernel environment. Reviewed by: glebius
Notes
Notes: svn path=/head/; revision=286057
Diffstat (limited to 'sys/net/radix.c')
-rw-r--r--sys/net/radix.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/radix.c b/sys/net/radix.c
index d16c92490729..d6db35ea3a94 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -533,7 +533,7 @@ rn_addmask(void *n_arg, struct radix_node_head *maskhead, int search, int skip)
x = rn_insert(cp, maskhead, &maskduplicated, x);
if (maskduplicated) {
log(LOG_ERR, "rn_addmask: mask impossibly already in tree");
- Free(saved_x);
+ R_Free(saved_x);
return (x);
}
/*
@@ -829,7 +829,7 @@ rn_delete(void *v_arg, void *netmask_arg, struct radix_node_head *head)
for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist)
if (m == saved_m) {
*mp = m->rm_mklist;
- Free(m);
+ R_Free(m);
break;
}
if (m == 0) {
@@ -920,7 +920,7 @@ on1:
struct radix_mask *mm = m->rm_mklist;
x->rn_mklist = 0;
if (--(m->rm_refs) < 0)
- Free(m);
+ R_Free(m);
m = mm;
}
if (m)
@@ -1152,7 +1152,7 @@ rn_detachhead_internal(void **head)
rnh = *head;
/* Free <left,root,right> nodes. */
- Free(rnh);
+ R_Free(rnh);
*head = NULL;
}
@@ -1186,7 +1186,7 @@ rn_freeentry(struct radix_node *rn, void *arg)
x = (struct radix_node *)rn_delete(rn + 2, NULL, rnh);
if (x != NULL)
- Free(x);
+ R_Free(x);
return (0);
}