diff options
| -rw-r--r-- | conf/conf.c | 2 | ||||
| -rw-r--r-- | conf/conf.h | 2 | ||||
| -rw-r--r-- | nest/proto.c | 8 | ||||
| -rw-r--r-- | nest/rt-dev.c | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/conf/conf.c b/conf/conf.c index 50e5944b..3fd10ad8 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -504,7 +504,7 @@ order_shutdown(void) * error in the configuration. */ void -cf_error(char *msg, ...) +cf_error(const char *msg, ...) { char buf[1024]; va_list args; diff --git a/conf/conf.h b/conf/conf.h index 1c4f7fce..8e490c7b 100644 --- a/conf/conf.h +++ b/conf/conf.h @@ -68,7 +68,7 @@ int config_commit(struct config *, int type, int timeout); int config_confirm(void); int config_undo(void); void config_init(void); -void cf_error(char *msg, ...) NORET; +void cf_error(const char *msg, ...) NORET; void config_add_obstacle(struct config *); void config_del_obstacle(struct config *); void order_shutdown(void); diff --git a/nest/proto.c b/nest/proto.c index 5b55f9ee..f712fe5f 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -39,6 +39,12 @@ 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" +}; extern struct protocol proto_unix_iface; @@ -313,7 +319,7 @@ channel_set_state(struct channel *c, uint state) uint cs = c->channel_state; uint es = c->export_state; - DBG("%s reporting state transition %s/%s -> */%s\n", p->name, c_states[cs], p_states[ops], p_states[ps]); + DBG("%s reporting channel %s state transition %s -> %s\n", c->proto->name, c->name, cs_states[cs], cs_states[state]); if (state == cs) return; diff --git a/nest/rt-dev.c b/nest/rt-dev.c index 17737853..a996f4fc 100644 --- a/nest/rt-dev.c +++ b/nest/rt-dev.c @@ -34,7 +34,7 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad) if (!EMPTY_LIST(cf->iface_list) && !iface_patt_find(&cf->iface_list, ad->iface, ad->iface->addr)) - /* Empty list is automagically treated as "*" */ + /* Empty list is automatically treated as "*" */ return; if (ad->flags & IA_SECONDARY) |