From: Victor Julien <victor@inliniac.net>
Date: Tue, 9 Jun 2015 09:43:26 +0000 (+0200)
Subject: detect: remove struct/union tricks from Signature
X-Git-Tag: suricata-3.0RC1~334
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5483b800c5961d30f9e5a5cde88e8765d4405a14;p=thirdparty%2Fsuricata.git

detect: remove struct/union tricks from Signature
---

diff --git a/src/detect.h b/src/detect.h
index fbed549fe1..75a0a3436b 100644
--- a/src/detect.h
+++ b/src/detect.h
@@ -366,30 +366,19 @@ typedef struct SigMatchData_ {
 
 /** \brief Signature container */
 typedef struct Signature_ {
-    union {
-        struct {
-            /* coccinelle: Signature:flags:SIG_FLAG */
-            uint32_t flags;
-            AppProto alproto;
-            uint16_t dsize_low;
-        };
-        uint64_t hdr_copy1;
-    };
-    union {
-        struct {
-            uint16_t dsize_high;
-            uint16_t mpm_pattern_id_div_8;
-        };
-        uint32_t hdr_copy2;
-    };
-    union {
-        struct {
-            uint8_t mpm_pattern_id_mod_8;
-            SignatureMask mask;
-            SigIntId num; /**< signature number, internal id */
-        };
-        uint32_t hdr_copy3;
-    };
+    /* coccinelle: Signature:flags:SIG_FLAG */
+    uint32_t flags;
+
+    AppProto alproto;
+
+    uint16_t dsize_low;
+    uint16_t dsize_high;
+
+    uint16_t mpm_pattern_id_div_8;
+    uint8_t mpm_pattern_id_mod_8;
+
+    SignatureMask mask;
+    SigIntId num; /**< signature number, internal id */
 
     /** inline -- action */
     uint8_t action;