svn commit: r269468 - projects/ipfw/sys/netpfil/ipfw

[Alexander V. Chernikov]

Author: melifaro
Date: Sun Aug  3 09:53:34 2014
New Revision: 269468
URL: http://svnweb.freebsd.org/changeset/base/269468

Log:
  Be consistent on cidr:radix function naming: use algo name instead
    of "cidr".

Modified:
  projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c

Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c	Sun Aug  3 09:48:54 2014	(r269467)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c	Sun Aug  3 09:53:34 2014	(r269468)
@@ -192,7 +192,7 @@ ta_init_radix(struct ip_fw_chain *ch, vo
 }
 
 static int
-flush_table_entry(struct radix_node *rn, void *arg)
+flush_radix_entry(struct radix_node *rn, void *arg)
 {
 	struct radix_node_head * const rnh = arg;
 	struct radix_cidr_entry *ent;
@@ -210,11 +210,11 @@ ta_destroy_radix(void *ta_state, struct 
 	struct radix_node_head *rnh;
 
 	rnh = (struct radix_node_head *)(ti->state);
-	rnh->rnh_walktree(rnh, flush_table_entry, rnh);
+	rnh->rnh_walktree(rnh, flush_radix_entry, rnh);
 	rn_detachhead(&ti->state);
 
 	rnh = (struct radix_node_head *)(ti->xstate);
-	rnh->rnh_walktree(rnh, flush_table_entry, rnh);
+	rnh->rnh_walktree(rnh, flush_radix_entry, rnh);
 	rn_detachhead(&ti->xstate);
 }
 
@@ -351,7 +351,7 @@ tei_to_sockaddr_ent(struct tentry_info *
 }
 
 static int
-ta_prepare_add_cidr(struct ip_fw_chain *ch, struct tentry_info *tei,
+ta_prepare_add_radix(struct ip_fw_chain *ch, struct tentry_info *tei,
     void *ta_buf)
 {
 	struct ta_buf_cidr *tb;
@@ -405,7 +405,7 @@ ta_prepare_add_cidr(struct ip_fw_chain *
 }
 
 static int
-ta_add_cidr(void *ta_state, struct table_info *ti, struct tentry_info *tei,
+ta_add_radix(void *ta_state, struct table_info *ti, struct tentry_info *tei,
     void *ta_buf, uint32_t *pnum)
 {
 	struct radix_node_head *rnh;
@@ -458,7 +458,7 @@ ta_add_cidr(void *ta_state, struct table
 }
 
 static int
-ta_prepare_del_cidr(struct ip_fw_chain *ch, struct tentry_info *tei,
+ta_prepare_del_radix(struct ip_fw_chain *ch, struct tentry_info *tei,
     void *ta_buf)
 {
 	struct ta_buf_cidr *tb;
@@ -496,7 +496,7 @@ ta_prepare_del_cidr(struct ip_fw_chain *
 }
 
 static int
-ta_del_cidr(void *ta_state, struct table_info *ti, struct tentry_info *tei,
+ta_del_radix(void *ta_state, struct table_info *ti, struct tentry_info *tei,
     void *ta_buf, uint32_t *pnum)
 {
 	struct radix_node_head *rnh;
@@ -529,7 +529,7 @@ ta_del_cidr(void *ta_state, struct table
 }
 
 static void
-ta_flush_cidr_entry(struct ip_fw_chain *ch, struct tentry_info *tei,
+ta_flush_radix_entry(struct ip_fw_chain *ch, struct tentry_info *tei,
     void *ta_buf)
 {
 	struct ta_buf_cidr *tb;
@@ -561,11 +561,11 @@ struct table_algo cidr_radix = {
 	.ta_buf_size	= sizeof(struct ta_buf_cidr),
 	.init		= ta_init_radix,
 	.destroy	= ta_destroy_radix,
-	.prepare_add	= ta_prepare_add_cidr,
-	.prepare_del	= ta_prepare_del_cidr,
-	.add		= ta_add_cidr,
-	.del		= ta_del_cidr,
-	.flush_entry	= ta_flush_cidr_entry,
+	.prepare_add	= ta_prepare_add_radix,
+	.prepare_del	= ta_prepare_del_radix,
+	.add		= ta_add_radix,
+	.del		= ta_del_radix,
+	.flush_entry	= ta_flush_radix_entry,
 	.foreach	= ta_foreach_radix,
 	.dump_tentry	= ta_dump_radix_tentry,
 	.find_tentry	= ta_find_radix_tentry,