[master] f691baeb7 vcli: Extract a vcli_outv() function
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Mon Aug 21 20:52:07 UTC 2023
commit f691baeb72d08348eb37ce0e39529e6f89d759e8
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Thu Aug 17 14:58:43 2023 +0200
vcli: Extract a vcli_outv() function
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 02a3d4c84..a6cce1ddf 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -637,19 +637,27 @@ VCLS_Destroy(struct VCLS **csp)
* Utility functions for implementing CLI commands
*/
+static void
+vcli_outv(struct cli *cli, const char *fmt, va_list ap)
+{
+
+ if (VSB_len(cli->sb) < *cli->limit)
+ (void)VSB_vprintf(cli->sb, fmt, ap);
+ else if (cli->result == CLIS_OK)
+ cli->result = CLIS_TRUNCATED;
+}
+
/*lint -e{818} cli could be const */
void
VCLI_Out(struct cli *cli, const char *fmt, ...)
{
va_list ap;
- AN(cli);
- va_start(ap, fmt);
CHECK_OBJ_NOTNULL(cli, CLI_MAGIC);
- if (VSB_len(cli->sb) < *cli->limit)
- (void)VSB_vprintf(cli->sb, fmt, ap);
- else if (cli->result == CLIS_OK)
- cli->result = CLIS_TRUNCATED;
+ AN(fmt);
+
+ va_start(ap, fmt);
+ vcli_outv(cli, fmt, ap);
va_end(ap);
}
More information about the varnish-commit
mailing list