From: Victor Julien <victor@inliniac.net>
Date: Mon, 28 Nov 2016 12:03:34 +0000 (+0100)
Subject: proto detect: fix -Wshadow warning
X-Git-Tag: suricata-3.2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2432%2Fhead;p=thirdparty%2Fsuricata.git

proto detect: fix -Wshadow warning
---

diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c
index 9d93e9d73d..623a71b969 100644
--- a/src/app-layer-detect-proto.c
+++ b/src/app-layer-detect-proto.c
@@ -1079,7 +1079,6 @@ static int AppLayerProtoDetectPMSetContentIDs(AppLayerProtoDetectPMCtx *ctx)
     PatIntId max_id = 0;
     TempContainer *struct_offset = NULL;
     uint8_t *content_offset = NULL;
-    TempContainer *dup = NULL;
     int ret = 0;
 
     if (ctx->head == NULL)
@@ -1098,21 +1097,21 @@ static int AppLayerProtoDetectPMSetContentIDs(AppLayerProtoDetectPMCtx *ctx)
     struct_offset = (TempContainer *)ahb;
     content_offset = ahb + struct_total_size;
     for (s = ctx->head; s != NULL; s = s->next) {
-        dup = (TempContainer *)ahb;
+        TempContainer *tcdup = (TempContainer *)ahb;
         content = s->cd->content;
         content_len = s->cd->content_len;
 
-        for (; dup != struct_offset; dup++) {
-            if (dup->content_len != content_len ||
-                SCMemcmp(dup->content, content, dup->content_len) != 0)
+        for (; tcdup != struct_offset; tcdup++) {
+            if (tcdup->content_len != content_len ||
+                SCMemcmp(tcdup->content, content, tcdup->content_len) != 0)
             {
                 continue;
             }
             break;
         }
 
-        if (dup != struct_offset) {
-            s->cd->id = dup->id;
+        if (tcdup != struct_offset) {
+            s->cd->id = tcdup->id;
             continue;
         }