From: Victor Julien <victor@inliniac.net>
Date: Tue, 27 Mar 2012 15:05:39 +0000 (+0200)
Subject: Fix misc issues picked up by coccinelle.
X-Git-Tag: suricata-1.3beta1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf4ab2f7e1a22661a10f9fe65684632ecec5d132;p=thirdparty%2Fsuricata.git

Fix misc issues picked up by coccinelle.
---

diff --git a/src/flow.c b/src/flow.c
index 62f3e09c27..c37ba0b7b3 100644
--- a/src/flow.c
+++ b/src/flow.c
@@ -398,7 +398,7 @@ void FlowInitConfig(char quiet)
                 "Memcap: %"PRIu64", Hash table size %"PRIu64". Calculate "
                 "total hash size by multiplying \"flow.hash-size\" with %"PRIuMAX", "
                 "which is the hash bucket size.", flow_config.memcap, hash_size,
-                sizeof(FlowBucket));
+                (uintmax_t)sizeof(FlowBucket));
         exit(EXIT_FAILURE);
     }
     flow_hash = SCCalloc(flow_config.hash_size, sizeof(FlowBucket));
diff --git a/src/host.c b/src/host.c
index 7d98278270..d1694d9c42 100644
--- a/src/host.c
+++ b/src/host.c
@@ -175,7 +175,7 @@ void HostInitConfig(char quiet)
                 "Memcap: %"PRIu64", Hash table size %"PRIu64". Calculate "
                 "total hash size by multiplying \"host.hash-size\" with %"PRIuMAX", "
                 "which is the hash bucket size.", host_config.memcap, hash_size,
-                sizeof(HostHashRow));
+                (uintmax_t)sizeof(HostHashRow));
         exit(EXIT_FAILURE);
     }
     host_hash = SCCalloc(host_config.hash_size, sizeof(HostHashRow));
diff --git a/src/source-napatech.c b/src/source-napatech.c
index 4fc8b9b473..1a50b35618 100644
--- a/src/source-napatech.c
+++ b/src/source-napatech.c
@@ -321,13 +321,13 @@ TmEcode NapatechDecode(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
     SCPerfCounterIncr(dtv->counter_pkts, tv->sc_perf_pca);
     SCPerfCounterIncr(dtv->counter_pkts_per_sec, tv->sc_perf_pca);
 
-    SCPerfCounterAddUI64(dtv->counter_bytes, tv->sc_perf_pca, p->pktlen);
-    SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->sc_perf_pca, p->pktlen);
-    SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->sc_perf_pca,
-            (p->pktlen * 8)/1000000.0);
+    SCPerfCounterAddUI64(dtv->counter_bytes, tv->sc_perf_pca, GET_PKT_LEN(p));
+//    SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->sc_perf_pca, GET_PKT_LEN(p));
+//    SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->sc_perf_pca,
+//            (GET_PKT_LEN(p) * 8)/1000000.0);
 
-    SCPerfCounterAddUI64(dtv->counter_avg_pkt_size, tv->sc_perf_pca, p->pktlen);
-    SCPerfCounterSetUI64(dtv->counter_max_pkt_size, tv->sc_perf_pca, p->pktlen);
+    SCPerfCounterAddUI64(dtv->counter_avg_pkt_size, tv->sc_perf_pca, GET_PKT_LEN(p));
+    SCPerfCounterSetUI64(dtv->counter_max_pkt_size, tv->sc_perf_pca, GET_PKT_LEN(p));
 
     switch (p->datalink) {
         case LINKTYPE_ETHERNET: