From: Thierry FOURNIER <tfournier@arpalert.org>
Date: Thu, 20 Aug 2015 11:52:51 +0000 (+0200)
Subject: MINOR: samples: extract the anonymous union and create the union sample_value
X-Git-Tag: v1.6-dev4~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=654398a9378fee51cfb03f1446113a00e14cb8fe;p=thirdparty%2Fhaproxy.git

MINOR: samples: extract the anonymous union and create the union sample_value

This extract is not really required, but it maybe will be usefull later.
A comming soonpatch about simplification of stick table values will
use this union
---

diff --git a/include/types/sample.h b/include/types/sample.h
index 10b941b009..6d30943e57 100644
--- a/include/types/sample.h
+++ b/include/types/sample.h
@@ -242,16 +242,18 @@ struct meth {
 	struct chunk str;
 };
 
+union sample_value {
+	long long int   sint;  /* used for signed 64bits integers */
+	struct in_addr  ipv4;  /* used for ipv4 addresses */
+	struct in6_addr ipv6;  /* used for ipv6 addresses */
+	struct chunk    str;   /* used for char strings or buffers */
+	struct meth     meth;  /* used for http method */
+};
+
 /* Used to store sample constant */
 struct sample_data {
 	int type;                 /* SMP_T_* */
-	union {
-		long long int   sint;  /* used for signed 64bits integers */
-		struct in_addr  ipv4;  /* used for ipv4 addresses */
-		struct in6_addr ipv6;  /* used for ipv6 addresses */
-		struct chunk    str;   /* used for char strings or buffers */
-		struct meth     meth;  /* used for http method */
-	} data;                        /* sample data */
+	union sample_value data;  /* sample data */
 };
 
 /* a sample is a typed data extracted from a stream. It has a type, contents,