From f1692c510bf99c6840ac4eb32d087d1c92c391a1 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 6 Apr 2022 09:21:37 -0400 Subject: [PATCH] watchfrr: Rename restart_phase_t to `enum restart_phase` This will align with our coding standards. Signed-off-by: Donald Sharp --- watchfrr/watchfrr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index 4f50da380c..c4c4063991 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -70,14 +70,14 @@ struct thread_master *master; static bool watch_only = false; const char *pathspace; -typedef enum { +enum restart_phase { PHASE_NONE = 0, PHASE_INIT, PHASE_STOPS_PENDING, PHASE_WAITING_DOWN, PHASE_ZEBRA_RESTART_PENDING, PHASE_WAITING_ZEBRA_UP -} restart_phase_t; +}; static const char *const phase_str[] = { "Idle", @@ -103,7 +103,7 @@ struct restart_info { }; static struct global_state { - restart_phase_t phase; + enum restart_phase phase; struct thread *t_phase_hanging; struct thread *t_startup_timeout; const char *vtydir; @@ -848,7 +848,7 @@ static void phase_hanging(struct thread *t_hanging) gs.phase = PHASE_NONE; } -static void set_phase(restart_phase_t new_phase) +static void set_phase(enum restart_phase new_phase) { gs.phase = new_phase; thread_cancel(&gs.t_phase_hanging); -- 2.39.5