mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 07:31:54 +00:00
Code Releases Activity

Merge commit '145830bd' into thread-next

Browse Source
This commit is contained in:
Maria Matejka 2024-12-10 23:55:42 +01:00
commit fa0bda2278
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nest/cli.c
View File

@ -117,9 +117,8 @@ cli_alloc_out(cli *c, int size)
* macro instead. * macro instead.
*/ */
void void
cli_printf(cli *c, int code, char *msg, ...) cli_vprintf(cli *c, int code, const char *msg, va_list args)
{ {
va_list args;
byte buf[CLI_LINE_SIZE]; byte buf[CLI_LINE_SIZE];
int cd = code; int cd = code;
int errcode; int errcode;
@ -147,9 +146,7 @@ cli_printf(cli *c, int code, char *msg, ...)
} }
c->last_reply = cd; c->last_reply = cd;
va_start(args, msg);
cnt = bvsnprintf(buf+size, sizeof(buf)-size-1, msg, args); cnt = bvsnprintf(buf+size, sizeof(buf)-size-1, msg, args);
va_end(args);
if (cnt < 0) if (cnt < 0)
{ {
cli_printf(c, errcode, "<line overflow>"); cli_printf(c, errcode, "<line overflow>");

10
nest/cli.h
View File

@ -73,7 +73,15 @@ extern struct cli *this_cli; /* Used during parsing */
/* Functions to be called by command handlers */ /* 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) #define cli_msg(x...) cli_printf(this_cli, x)
void cli_set_timeformat(cli *c, const struct timeformat tf); void cli_set_timeformat(cli *c, const struct timeformat tf);