diff options
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/cmds.c | 2 | ||||
| -rw-r--r-- | nest/proto.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nest/cmds.c b/nest/cmds.c index 2bc672ea..371e8877 100644 --- a/nest/cmds.c +++ b/nest/cmds.c @@ -28,7 +28,7 @@ cmd_show_status(void) tm_format_datetime(tim, &config->tf_base, now); cli_msg(-1011, "Router ID is %R", config->router_id); cli_msg(-1011, "Current server time is %s", tim); - tm_format_datetime(tim, &config->tf_base, boot_time); + tm_format_datetime(tim, &config->tf_base, boot_time TO_S); cli_msg(-1011, "Last reboot on %s", tim); tm_format_datetime(tim, &config->tf_base, config->load_time); cli_msg(-1011, "Last reconfiguration on %s", tim); diff --git a/nest/proto.c b/nest/proto.c index 361bb225..65375c35 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -43,7 +43,7 @@ static char *c_states[] = { "DOWN", "START", "UP", "FLUSHING" }; extern struct protocol proto_unix_iface; -static void proto_shutdown_loop(struct timer *); +static void proto_shutdown_loop(timer *); static void proto_rethink_goal(struct proto *p); static char *proto_state_name(struct proto *p); static void channel_verify_limits(struct channel *c); @@ -1046,7 +1046,7 @@ proto_rethink_goal(struct proto *p) * */ -static void graceful_restart_done(struct timer *t); +static void graceful_restart_done(timer *t); /** * graceful_restart_recovery - request initial graceful restart recovery @@ -1099,7 +1099,7 @@ graceful_restart_init(void) * restart wait timer fires (but there are still some locks). */ static void -graceful_restart_done(struct timer *t UNUSED) +graceful_restart_done(timer *t UNUSED) { log(L_INFO "Graceful restart done"); graceful_restart_state = GRS_DONE; @@ -1298,7 +1298,7 @@ protos_build(void) int proto_restart; static void -proto_shutdown_loop(struct timer *t UNUSED) +proto_shutdown_loop(timer *t UNUSED) { struct proto *p, *p_next; |