From: Maria Matejka <mq@ucw.cz>
Date: Tue, 10 Dec 2024 22:55:42 +0000 (+0100)
Subject: Merge commit '145830bd' into thread-next
X-Git-Tag: v3.0.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa0bda2278f63e632f2a126e495a4cb44e96534c;p=thirdparty%2Fbird.git

Merge commit '145830bd' into thread-next
---

fa0bda2278f63e632f2a126e495a4cb44e96534c
diff --cc nest/cli.h
index e9b59c515,423b21803..54fc29640
--- a/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)