[master] c0fa7bd35 mgt: Split the printing part from MGT_Complain() into MGT_ComplainVSB()

Nils Goroll nils.goroll at uplex.de
Thu Feb 13 20:27:05 UTC 2025


commit c0fa7bd35d479528dce0a5587c782c0d25886a4a
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Feb 13 17:39:34 2025 +0100

    mgt: Split the printing part from MGT_Complain() into MGT_ComplainVSB()

diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 172288ab2..bcdc81d70 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -219,6 +219,7 @@ char *mgt_HostName(void);
 void mgt_ProcTitle(const char *comp);
 void mgt_DumpRstVsl(void);
 struct vsb *mgt_BuildVident(void);
+void MGT_ComplainVSB(const char *, const struct vsb *vsb);
 void MGT_Complain(const char *, const char *, ...) v_printflike_(2, 3);
 const void *MGT_Pick(const struct choice *, const char *, const char *);
 char **MGT_NamedArg(const char *, const char **, const char *);
diff --git a/bin/varnishd/mgt/mgt_util.c b/bin/varnishd/mgt/mgt_util.c
index f43b43b0d..435e60673 100644
--- a/bin/varnishd/mgt/mgt_util.c
+++ b/bin/varnishd/mgt/mgt_util.c
@@ -144,20 +144,12 @@ const char C_SECURITY[] = "Security:";
 const char C_CLI[] = "Cli:";
 
 void
-MGT_Complain(const char *loud, const char *fmt, ...)
+MGT_ComplainVSB(const char *loud, const struct vsb *vsb)
 {
-	va_list ap;
-	struct vsb *vsb;
 	int sf;
 
 	if (loud == C_CLI && !mgt_param.syslog_cli_traffic)
 		return;
-	vsb = VSB_new_auto();
-	AN(vsb);
-	va_start(ap, fmt);
-	VSB_vprintf(vsb, fmt, ap);
-	va_end(ap);
-	AZ(VSB_finish(vsb));
 
 	if (loud == C_ERR)
 		sf = LOG_ERR;
@@ -177,6 +169,21 @@ MGT_Complain(const char *loud, const char *fmt, ...)
 
 	if (!MGT_DO_DEBUG(DBG_VTC_MODE))
 		syslog(sf, "%s", VSB_data(vsb));
+}
+
+void
+MGT_Complain(const char *loud, const char *fmt, ...)
+{
+	va_list ap;
+	struct vsb *vsb;
+
+	vsb = VSB_new_auto();
+	AN(vsb);
+	va_start(ap, fmt);
+	VSB_vprintf(vsb, fmt, ap);
+	va_end(ap);
+	AZ(VSB_finish(vsb));
+	MGT_ComplainVSB(loud, vsb);
 	VSB_destroy(&vsb);
 }
 


More information about the varnish-commit mailing list