*: Convert THREAD_XXX macros to EVENT_XXX macros

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

7 files changed, 19 insertions, 19 deletions

diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c
index cfa4b22af6..b56380f0e8 100644
--- a/eigrpd/eigrp_filter.c
+++ b/eigrpd/eigrp_filter.c
@@ -246,7 +246,7 @@ void eigrp_distribute_timer_process(struct event *thread)
 {
 	struct eigrp *eigrp;
 
-	eigrp = THREAD_ARG(thread);
+	eigrp = EVENT_ARG(thread);
 
 	/* execute GR for whole process */
 	eigrp_update_send_process_GR(eigrp, EIGRP_GR_FILTER, NULL);
@@ -267,7 +267,7 @@ void eigrp_distribute_timer_interface(struct event *thread)
 {
 	struct eigrp_interface *ei;
 
-	ei = THREAD_ARG(thread);
+	ei = EVENT_ARG(thread);
 	ei->t_distribute = NULL;
 
 	/* execute GR for interface */
diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
index 12de6d4a13..d8cc4a45ed 100644
--- a/eigrpd/eigrp_hello.c
+++ b/eigrpd/eigrp_hello.c
@@ -70,7 +70,7 @@ void eigrp_hello_timer(struct event *thread)
 {
 	struct eigrp_interface *ei;
 
-	ei = THREAD_ARG(thread);
+	ei = EVENT_ARG(thread);
 
 	if (IS_DEBUG_EIGRP(0, TIMERS))
 		zlog_debug("Start Hello Timer (%s) Expire [%u]", IF_NAME(ei),
diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c
index 297a312a67..e983f46cc8 100644
--- a/eigrpd/eigrp_interface.c
+++ b/eigrpd/eigrp_interface.c
@@ -333,7 +333,7 @@ int eigrp_if_down(struct eigrp_interface *ei)
 		return 0;
 
 	/* Shutdown packet reception and sending */
-	THREAD_OFF(ei->t_hello);
+	EVENT_OFF(ei->t_hello);
 
 	eigrp_if_stream_unset(ei);
 
diff --git a/eigrpd/eigrp_neighbor.c b/eigrpd/eigrp_neighbor.c
index 05d1b12f13..667fb02ce1 100644
--- a/eigrpd/eigrp_neighbor.c
+++ b/eigrpd/eigrp_neighbor.c
@@ -167,7 +167,7 @@ void eigrp_nbr_delete(struct eigrp_neighbor *nbr)
 	event_cancel_event(master, nbr);
 	eigrp_fifo_free(nbr->multicast_queue);
 	eigrp_fifo_free(nbr->retrans_queue);
-	THREAD_OFF(nbr->t_holddown);
+	EVENT_OFF(nbr->t_holddown);
 
 	if (nbr->ei)
 		listnode_delete(nbr->ei->nbrs, nbr);
@@ -176,7 +176,7 @@ void eigrp_nbr_delete(struct eigrp_neighbor *nbr)
 
 void holddown_timer_expired(struct event *thread)
 {
-	struct eigrp_neighbor *nbr = THREAD_ARG(thread);
+	struct eigrp_neighbor *nbr = EVENT_ARG(thread);
 	struct eigrp *eigrp = nbr->ei->eigrp;
 
 	zlog_info("Neighbor %pI4 (%s) is down: holding time expired", &nbr->src,
@@ -210,7 +210,7 @@ void eigrp_nbr_state_set(struct eigrp_neighbor *nbr, uint8_t state)
 
 		// hold time..
 		nbr->v_holddown = EIGRP_HOLD_INTERVAL_DEFAULT;
-		THREAD_OFF(nbr->t_holddown);
+		EVENT_OFF(nbr->t_holddown);
 
 		/* out with the old */
 		if (nbr->multicast_queue)
@@ -252,22 +252,22 @@ void eigrp_nbr_state_update(struct eigrp_neighbor *nbr)
 	switch (nbr->state) {
 	case EIGRP_NEIGHBOR_DOWN: {
 		/*Start Hold Down Timer for neighbor*/
-		//     THREAD_OFF(nbr->t_holddown);
-		//     THREAD_TIMER_ON(master, nbr->t_holddown,
+		//     EVENT_OFF(nbr->t_holddown);
+		//     EVENT_TIMER_ON(master, nbr->t_holddown,
 		//     holddown_timer_expired,
 		//     nbr, nbr->v_holddown);
 		break;
 	}
 	case EIGRP_NEIGHBOR_PENDING: {
 		/*Reset Hold Down Timer for neighbor*/
-		THREAD_OFF(nbr->t_holddown);
+		EVENT_OFF(nbr->t_holddown);
 		event_add_timer(master, holddown_timer_expired, nbr,
 				nbr->v_holddown, &nbr->t_holddown);
 		break;
 	}
 	case EIGRP_NEIGHBOR_UP: {
 		/*Reset Hold Down Timer for neighbor*/
-		THREAD_OFF(nbr->t_holddown);
+		EVENT_OFF(nbr->t_holddown);
 		event_add_timer(master, holddown_timer_expired, nbr,
 				nbr->v_holddown, &nbr->t_holddown);
 		break;
diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index 51b68fb34b..8c3e75228c 100644
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -307,7 +307,7 @@ int eigrp_check_sha256_digest(struct stream *s,
 
 void eigrp_write(struct event *thread)
 {
-	struct eigrp *eigrp = THREAD_ARG(thread);
+	struct eigrp *eigrp = EVENT_ARG(thread);
 	struct eigrp_header *eigrph;
 	struct eigrp_interface *ei;
 	struct eigrp_packet *ep;
@@ -474,7 +474,7 @@ void eigrp_read(struct event *thread)
 	uint16_t length = 0;
 
 	/* first of all get interface pointer. */
-	eigrp = THREAD_ARG(thread);
+	eigrp = EVENT_ARG(thread);
 
 	/* prepare for next packet. */
 	event_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read);
@@ -923,7 +923,7 @@ void eigrp_packet_free(struct eigrp_packet *ep)
 	if (ep->s)
 		stream_free(ep->s);
 
-	THREAD_OFF(ep->t_retrans_timer);
+	EVENT_OFF(ep->t_retrans_timer);
 
 	XFREE(MTYPE_EIGRP_PACKET, ep);
 }
@@ -973,7 +973,7 @@ static int eigrp_check_network_mask(struct eigrp_interface *ei,
 void eigrp_unack_packet_retrans(struct event *thread)
 {
 	struct eigrp_neighbor *nbr;
-	nbr = (struct eigrp_neighbor *)THREAD_ARG(thread);
+	nbr = (struct eigrp_neighbor *)EVENT_ARG(thread);
 
 	struct eigrp_packet *ep;
 	ep = eigrp_fifo_next(nbr->retrans_queue);
@@ -1009,7 +1009,7 @@ void eigrp_unack_packet_retrans(struct event *thread)
 void eigrp_unack_multicast_packet_retrans(struct event *thread)
 {
 	struct eigrp_neighbor *nbr;
-	nbr = (struct eigrp_neighbor *)THREAD_ARG(thread);
+	nbr = (struct eigrp_neighbor *)EVENT_ARG(thread);
 
 	struct eigrp_packet *ep;
 	ep = eigrp_fifo_next(nbr->multicast_queue);
diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c
index 1a0729d32b..fb39c6efdf 100644
--- a/eigrpd/eigrp_update.c
+++ b/eigrpd/eigrp_update.c
@@ -900,7 +900,7 @@ void eigrp_update_send_GR_thread(struct event *thread)
 	struct eigrp_neighbor *nbr;
 
 	/* get argument from thread */
-	nbr = THREAD_ARG(thread);
+	nbr = EVENT_ARG(thread);
 	/* remove this thread pointer */
 
 	/* if there is packet waiting in queue,
diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c
index f94bcea736..58241b5f17 100644
--- a/eigrpd/eigrpd.c
+++ b/eigrpd/eigrpd.c
@@ -260,8 +260,8 @@ void eigrp_finish_final(struct eigrp *eigrp)
 		eigrp_if_free(ei, INTERFACE_DOWN_BY_FINAL);
 	}
 
-	THREAD_OFF(eigrp->t_write);
-	THREAD_OFF(eigrp->t_read);
+	EVENT_OFF(eigrp->t_write);
+	EVENT_OFF(eigrp->t_read);
 	close(eigrp->fd);
 
 	list_delete(&eigrp->eiflist);