From: Victor Julien <victor@inliniac.net>
Date: Wed, 11 Dec 2013 08:35:41 +0000 (+0100)
Subject: defrag: pass u64 to ParseU64
X-Git-Tag: suricata-2.0beta2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31a94cd4cb9c909b856db3a4c9fb041e37cc0fb5;p=thirdparty%2Fsuricata.git

defrag: pass u64 to ParseU64

Fixes: defrag-config.c:97: warning: passing argument 2 \
       of 'ParseSizeStringU64' from incompatible pointer type
---

diff --git a/src/defrag-config.c b/src/defrag-config.c
index 69553a0d0c..b17d6d0e32 100644
--- a/src/defrag-config.c
+++ b/src/defrag-config.c
@@ -89,23 +89,23 @@ int DefragPolicyGetHostTimeout(Packet *p)
 static void DefragParseParameters(ConfNode *n)
 {
     ConfNode *si;
-    uintmax_t timeout = 0;
+    uint64_t timeout = 0;
 
     TAILQ_FOREACH(si, &n->head, next) {
         if (strcasecmp("timeout", si->name) == 0) {
-                SCLogDebug("timeout value  %s", si->val);
-                if (ParseSizeStringU64(si->val, &timeout) < 0) {
-                    SCLogError(SC_ERR_SIZE_PARSE, "Error parsing timeout "
-                               "from conf file");
-                }
+            SCLogDebug("timeout value  %s", si->val);
+            if (ParseSizeStringU64(si->val, &timeout) < 0) {
+                SCLogError(SC_ERR_SIZE_PARSE, "Error parsing timeout "
+                        "from conf file");
             }
-            if (strcasecmp("address", si->name) == 0) {
-                ConfNode *pval;
-                TAILQ_FOREACH(pval, &si->head, next) {
-                    DefragPolicyAddHostInfo(pval->val, &timeout);
-                }
+        }
+        if (strcasecmp("address", si->name) == 0) {
+            ConfNode *pval;
+            TAILQ_FOREACH(pval, &si->head, next) {
+                DefragPolicyAddHostInfo(pval->val, &timeout);
             }
         }
+    }
 }
 
 void DefragSetDefaultTimeout(intmax_t timeout)