diff options
author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2016-05-12 16:04:47 +0200 |
---|---|---|
committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2016-05-12 16:04:47 +0200 |
commit | 286e2011d22ea6914d5f2db5de3f11911a1fb663 (patch) | |
tree | 7caa6725f988f51fab0c3ba09a909c66c828b378 /nest/proto.c | |
parent | 0c6dfe52369a59d7f3da8ee6bc7c505e3da5c064 (diff) |
Miscellaneous minor fixes
Diffstat (limited to 'nest/proto.c')
-rw-r--r-- | nest/proto.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/nest/proto.c b/nest/proto.c index df4952b7..ce859f13 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -39,12 +39,7 @@ static int graceful_restart_state; static u32 graceful_restart_locks; static char *p_states[] = { "DOWN", "START", "UP", "STOP" }; -static char *cs_states[] = { - [CS_DOWN] = "DOWN", - [CS_START] = "START", - [CS_UP] = "UP", - [CS_FLUSHING] = "FLUSHING" -}; +static char *c_states[] UNUSED = { "DOWN", "START", "UP", "FLUSHING" }; extern struct protocol proto_unix_iface; @@ -320,7 +315,7 @@ channel_set_state(struct channel *c, uint state) uint cs = c->channel_state; uint es = c->export_state; - DBG("%s reporting channel %s state transition %s -> %s\n", c->proto->name, c->name, cs_states[cs], cs_states[state]); + DBG("%s reporting channel %s state transition %s -> %s\n", c->proto->name, c->name, c_states[cs], c_states[state]); if (state == cs) return; @@ -1016,7 +1011,7 @@ proto_rethink_goal(struct proto *p) * enabled protocols are marked with @gr_recovery flag before start. Such * protocols then decide how to proceed with graceful restart, participation is * voluntary. Protocols could lock the recovery for each channel by function - * channel_graceful_restart_lock() (starte stored in @gr_lock flag), which means + * channel_graceful_restart_lock() (state stored in @gr_lock flag), which means * that they want to postpone the end of the recovery until they converge and * then unlock it. They also could set @gr_wait before advancing to %PS_UP, * which means that the core should defer route export to that channel until |