*: Convert struct thread_master to struct event_master and it's ilk

Convert the `struct thread_master` to `struct event_master`
across the code base.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

8 files changed, 10 insertions, 10 deletions

diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 6b5134a2b..23d43408f 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -62,7 +62,7 @@ struct zebra_privs_t ospf6d_privs = {
 struct option longopts[] = {{0}};
 
 /* Master of threads. */
-struct thread_master *master;
+struct event_master *master;
 
 static void __attribute__((noreturn)) ospf6_exit(int status)
 {
diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index 46fa27dd9..9aee6dddc 100644
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -1383,7 +1383,7 @@ static int ospf6TrapIfStateChange(struct ospf6_interface *oi, int next_state,
 }
 
 /* Register OSPFv3-MIB. */
-static int ospf6_snmp_init(struct thread_master *master)
+static int ospf6_snmp_init(struct event_master *master)
 {
 	smux_init(master);
 	REGISTER_MIB("OSPFv3MIB", ospfv3_variables, variable, ospfv3_oid);
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 58124cabd..54f4d854d 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -564,7 +564,7 @@ static void ospf6_disable(struct ospf6 *o)
 	}
 }
 
-void ospf6_master_init(struct thread_master *master)
+void ospf6_master_init(struct event_master *master)
 {
 	memset(&ospf6_master, 0, sizeof(ospf6_master));
 
diff --git a/ospf6d/ospf6_top.h b/ospf6d/ospf6_top.h
index 73c875124..29badb0a9 100644
--- a/ospf6d/ospf6_top.h
+++ b/ospf6d/ospf6_top.h
@@ -13,7 +13,7 @@ struct ospf6_master {
 	/* OSPFv3 instance. */
 	struct list *ospf6;
 	/* OSPFv3 thread master. */
-	struct thread_master *master;
+	struct event_master *master;
 };
 
 /* ospf6->config_flags */
@@ -233,7 +233,7 @@ extern struct ospf6 *ospf6;
 extern struct ospf6_master *om6;
 
 /* prototypes */
-extern void ospf6_master_init(struct thread_master *master);
+extern void ospf6_master_init(struct event_master *master);
 extern void install_element_ospf6_clear_process(void);
 extern void ospf6_top_init(void);
 extern void ospf6_delete(struct ospf6 *o);
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 0ccbb4d65..5ace3ca55 100644
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -750,7 +750,7 @@ static zclient_handler *const ospf6_handlers[] = {
 	[ZEBRA_NEXTHOP_UPDATE] = ospf6_zebra_import_check_update,
 };
 
-void ospf6_zebra_init(struct thread_master *master)
+void ospf6_zebra_init(struct event_master *master)
 {
 	/* Allocate zebra structure. */
 	zclient = zclient_new(master, &zclient_options_default, ospf6_handlers,
diff --git a/ospf6d/ospf6_zebra.h b/ospf6d/ospf6_zebra.h
index eb6d919b3..79864394a 100644
--- a/ospf6d/ospf6_zebra.h
+++ b/ospf6d/ospf6_zebra.h
@@ -39,7 +39,7 @@ extern void ospf6_zebra_redistribute(int, vrf_id_t vrf_id);
 extern void ospf6_zebra_no_redistribute(int, vrf_id_t vrf_id);
 #define ospf6_zebra_is_redistribute(type, vrf_id)                              \
 	vrf_bitmap_check(zclient->redist[AFI_IP6][type], vrf_id)
-extern void ospf6_zebra_init(struct thread_master *tm);
+extern void ospf6_zebra_init(struct event_master *tm);
 extern void ospf6_zebra_import_default_route(struct ospf6 *ospf6, bool unreg);
 extern void ospf6_zebra_add_discard(struct ospf6_route *request,
 				    struct ospf6 *ospf6);
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index eea487012..1a6e7e07b 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -1375,7 +1375,7 @@ DEFUN(show_ipv6_ospf6_linkstate_detail, show_ipv6_ospf6_linkstate_detail_cmd,
 }
 
 /* Install ospf related commands. */
-void ospf6_init(struct thread_master *master)
+void ospf6_init(struct event_master *master)
 {
 	ospf6_top_init();
 	ospf6_area_init();
diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h
index 3a2eb71c3..1d9427252 100644
--- a/ospf6d/ospf6d.h
+++ b/ospf6d/ospf6d.h
@@ -13,7 +13,7 @@
 DECLARE_MGROUP(OSPF6D);
 
 /* global variables */
-extern struct thread_master *master;
+extern struct event_master *master;
 
 /* Historical for KAME.  */
 #ifndef IPV6_JOIN_GROUP
@@ -109,6 +109,6 @@ extern struct zebra_privs_t ospf6d_privs;
 extern struct route_node *route_prev(struct route_node *node);
 
 extern void ospf6_debug(void);
-extern void ospf6_init(struct thread_master *master);
+extern void ospf6_init(struct event_master *master);
 
 #endif /* OSPF6D_H */