From: Willy Tarreau <w@1wt.eu>
Date: Thu, 29 Aug 2019 07:33:42 +0000 (+0200)
Subject: MINOR: trace: replace struct trace_lockon_args with struct name_desc
X-Git-Tag: v2.1-dev2~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be5a28842485d1169eb185c4d421ba43d5956ccf;p=thirdparty%2Fhaproxy.git

MINOR: trace: replace struct trace_lockon_args with struct name_desc

No need for a specific struct anymore, name_desc suits us.
---

diff --git a/include/types/trace.h b/include/types/trace.h
index 152cc8ff6c..b3f418f6b2 100644
--- a/include/types/trace.h
+++ b/include/types/trace.h
@@ -114,15 +114,6 @@ struct trace_event {
 	const char *desc;
 };
 
-/* add a name and description for each arg that we know we can track. Those
- * with a non-null name will be presented in the menu and will be usable for
- * trace lock-on.
- */
-struct trace_lockon_arg {
-	const char *name;
-	const char *desc;
-};
-
 struct trace_source {
 	/* source definition */
 	const struct ist name;
@@ -133,7 +124,7 @@ struct trace_source {
 	                   const struct trace_source *src, const struct ist where,
 	                   const void *a1, const void *a2, const void *a3, const void *a4);
 	uint32_t arg_def;        // argument definitions (sum of TRC_ARG{1..4}_*)
-	const struct trace_lockon_arg *lockon_args; // must be 4 entries if not NULL
+	const struct name_desc *lockon_args; // must be 4 entries if not NULL
 	/* trace configuration, adjusted by "trace <module>" on CLI */
 	enum trace_lockon lockon;
 	uint64_t start_events;   // what will start the trace. default: 0=nothing