*: Convert THREAD_XXX macros to EVENT_XXX macros

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

4 files changed, 13 insertions, 13 deletions

diff --git a/pathd/path_pcep_controller.c b/pathd/path_pcep_controller.c
index 4f03dbde27..a8897fc335 100644
--- a/pathd/path_pcep_controller.c
+++ b/pathd/path_pcep_controller.c
@@ -328,7 +328,7 @@ int pcep_ctrl_halt_cb(struct frr_pthread *fpt, void **res)
 
 void pcep_refine_path_event_cb(struct event *thread)
 {
-	struct pcep_refine_path_event_data *data = THREAD_ARG(thread);
+	struct pcep_refine_path_event_data *data = EVENT_ARG(thread);
 	assert(data != NULL);
 	struct ctrl_state *ctrl_state = data->ctrl_state;
 	struct path *path = data->path;
@@ -390,7 +390,7 @@ void pcep_thread_cancel_timer(struct event **thread)
 		return;
 	}
 
-	struct pcep_ctrl_timer_data *data = THREAD_ARG(*thread);
+	struct pcep_ctrl_timer_data *data = EVENT_ARG(*thread);
 	PCEP_DEBUG("Timer %s / %s canceled", timer_type_name(data->timer_type),
 		   timeout_type_name(data->timeout_type));
 	if (data != NULL) {
@@ -496,7 +496,7 @@ void pcep_thread_path_refined_event(struct ctrl_state *ctrl_state,
 void pcep_thread_finish_event_handler(struct event *thread)
 {
 	int i;
-	struct frr_pthread *fpt = THREAD_ARG(thread);
+	struct frr_pthread *fpt = EVENT_ARG(thread);
 	struct ctrl_state *ctrl_state = fpt->data;
 
 	assert(ctrl_state != NULL);
@@ -554,7 +554,7 @@ int schedule_thread_timer(struct ctrl_state *ctrl_state, int pcc_id,
 void pcep_thread_timer_handler(struct event *thread)
 {
 	/* data unpacking */
-	struct pcep_ctrl_timer_data *data = THREAD_ARG(thread);
+	struct pcep_ctrl_timer_data *data = EVENT_ARG(thread);
 	assert(data != NULL);
 	struct ctrl_state *ctrl_state = data->ctrl_state;
 	assert(ctrl_state != NULL);
@@ -600,7 +600,7 @@ void pcep_thread_timer_handler(struct event *thread)
 
 void pcep_thread_pcep_event(struct event *thread)
 {
-	struct pcep_ctrl_event_data *data = THREAD_ARG(thread);
+	struct pcep_ctrl_event_data *data = EVENT_ARG(thread);
 	assert(data != NULL);
 	struct ctrl_state *ctrl_state = data->ctrl_state;
 	pcep_event *event = data->payload;
@@ -710,7 +710,7 @@ int send_to_thread_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
 void pcep_thread_event_handler(struct event *thread)
 {
 	/* data unpacking */
-	struct pcep_ctrl_event_data *data = THREAD_ARG(thread);
+	struct pcep_ctrl_event_data *data = EVENT_ARG(thread);
 	assert(data != NULL);
 	struct ctrl_state *ctrl_state = data->ctrl_state;
 	assert(ctrl_state != NULL);
@@ -972,7 +972,7 @@ int send_to_main(struct ctrl_state *ctrl_state, int pcc_id,
 void pcep_main_event_handler(struct event *thread)
 {
 	/* data unpacking */
-	struct pcep_main_event_data *data = THREAD_ARG(thread);
+	struct pcep_main_event_data *data = EVENT_ARG(thread);
 	assert(data != NULL);
 	pcep_main_event_handler_t handler = data->handler;
 	enum pcep_main_event_type type = data->type;
diff --git a/pathd/path_pcep_lib.c b/pathd/path_pcep_lib.c
index dcf4921d7b..d43fdb083e 100644
--- a/pathd/path_pcep_lib.c
+++ b/pathd/path_pcep_lib.c
@@ -231,7 +231,7 @@ int pcep_lib_pceplib_socket_read_cb(void *fpt, void **thread, int fd,
 
 void pcep_lib_socket_write_ready(struct event *thread)
 {
-	struct pcep_ctrl_socket_data *data = THREAD_ARG(thread);
+	struct pcep_ctrl_socket_data *data = EVENT_ARG(thread);
 	assert(data != NULL);
 
 	pceplib_external_socket_write(data->fd, data->payload);
@@ -240,7 +240,7 @@ void pcep_lib_socket_write_ready(struct event *thread)
 
 void pcep_lib_socket_read_ready(struct event *thread)
 {
-	struct pcep_ctrl_socket_data *data = THREAD_ARG(thread);
+	struct pcep_ctrl_socket_data *data = EVENT_ARG(thread);
 	assert(data != NULL);
 
 	pceplib_external_socket_read(data->fd, data->payload);
diff --git a/pathd/path_ted.c b/pathd/path_ted.c
index c13b0188f2..f471a89494 100644
--- a/pathd/path_ted.c
+++ b/pathd/path_ted.c
@@ -600,7 +600,7 @@ enum zclient_send_status path_ted_link_state_sync(void)
 void path_ted_timer_handler_sync(struct event *thread)
 {
 	/* data unpacking */
-	struct ted_state *data = THREAD_ARG(thread);
+	struct ted_state *data = EVENT_ARG(thread);
 
 	assert(data != NULL);
 	/* Retry the sync */
@@ -640,7 +640,7 @@ void path_ted_timer_handler_refresh(struct event *thread)
 
 	PATH_TED_DEBUG("%s: PATHD-TED: Refresh sid from current TED", __func__);
 	/* data unpacking */
-	struct ted_state *data = THREAD_ARG(thread);
+	struct ted_state *data = EVENT_ARG(thread);
 
 	assert(data != NULL);
 
diff --git a/pathd/pathd.c b/pathd/pathd.c
index d1c0c82d9d..6c13503c7d 100644
--- a/pathd/pathd.c
+++ b/pathd/pathd.c
@@ -1299,7 +1299,7 @@ void trigger_pathd_candidate_created(struct srte_candidate *candidate)
 
 void trigger_pathd_candidate_created_timer(struct event *thread)
 {
-	struct srte_candidate *candidate = THREAD_ARG(thread);
+	struct srte_candidate *candidate = EVENT_ARG(thread);
 	candidate->hook_timer = NULL;
 	hook_call(pathd_candidate_created, candidate);
 }
@@ -1319,7 +1319,7 @@ void trigger_pathd_candidate_updated(struct srte_candidate *candidate)
 
 void trigger_pathd_candidate_updated_timer(struct event *thread)
 {
-	struct srte_candidate *candidate = THREAD_ARG(thread);
+	struct srte_candidate *candidate = EVENT_ARG(thread);
 	candidate->hook_timer = NULL;
 	hook_call(pathd_candidate_updated, candidate);
 }