Merge commit '145830bd' into thread-next

diff --cc nest/cli.c
Simple merge

diff --cc nest/cli.h
index e9b59c5157d696f5a0c5a71a10b5c8804437aa84,423b2180315a132559720ebefd92b204b1b7bf63..54fc29640a74d8ee1ceb421e0d67b7d5881c79d4
--- 1/nest/cli.h
--- 2/nest/cli.h
+++ b/nest/cli.h
@@@ -73,8 -75,17 +73,16 @@@ extern struct cli *this_cli;                /* Used d
  
  /* Functions to be called by command handlers */
  
- void cli_printf(cli *, int, char *, ...);
+ void cli_vprintf(cli *, int, const char *, va_list);
+ static inline void cli_printf(cli *cli, int code, const char *fmt, ...)
+ {
+   va_list args;
+   va_start(args, fmt);
+   cli_vprintf(cli, code, fmt, args);
+   va_end(args);
+ }
+ 
  #define cli_msg(x...) cli_printf(this_cli, x)
 -void cli_set_log_echo(cli *, uint mask, uint size);
  void cli_set_timeformat(cli *c, const struct timeformat tf);
  
  static inline void cli_separator(cli *c)