lib: remove affinity map duplicate

ASAN states that there is a duplicata in affinity map. Fix it by removing. Signed-off-by: Dmytro Shytyi <[email protected]>
FRRouting · Feb 7, 2024 · abd7822 · abd7822
1 parent 285551d
commit abd7822
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 24 deletions.
diff --git a/lib/affinitymap.h b/lib/affinitymap.h
@@ -58,7 +58,6 @@ struct affinity_maps {
 DECLARE_QOBJ_TYPE(affinity_maps);
 
 extern const struct frr_yang_module_info frr_affinity_map_info;
-extern const struct frr_yang_module_info frr_affinity_map_cli_info;
 
 void affinity_map_set(const char *name, int pos);
 void affinity_map_unset(const char *name);

diff --git a/lib/affinitymap_cli.c b/lib/affinitymap_cli.c
@@ -66,28 +66,6 @@ DEFPY_YANG_NOSH(no_affinity_map, no_affinity_map_cmd,
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-static void cli_show_affinity_map(struct vty *vty, const struct lyd_node *dnode,
-			   bool show_defaults __attribute__((__unused__)))
-{
-	vty_out(vty, "affinity-map %s bit-position %u\n",
-		yang_dnode_get_string(dnode, "name"),
-		yang_dnode_get_uint16(dnode, "value"));
-}
-
-const struct frr_yang_module_info frr_affinity_map_cli_info = {
-	.name = "frr-affinity-map",
-	.ignore_cfg_cbs = true,
-	.nodes = {
-		{
-			.xpath = "/frr-affinity-map:lib/affinity-maps/affinity-map",
-			.cbs.cli_show = cli_show_affinity_map,
-		},
-		{
-			.xpath = NULL,
-		},
-	}
-};
-
 /* Initialization of affinity map vector. */
 void affinity_map_init(void)
 {

diff --git a/mgmtd/mgmt_main.c b/mgmtd/mgmt_main.c
@@ -174,7 +174,7 @@ static const struct frr_yang_module_info *const mgmt_yang_modules[] = {
 	&frr_route_map_cli_info,
 	&frr_routing_cli_info,
 	&frr_vrf_cli_info,
-	&frr_affinity_map_cli_info,
+	&frr_affinity_map_info,
 
 	/* mgmtd-only modules */
 	&ietf_netconf_with_defaults_info,