util: fix integer warnings in profiling

diff --git a/src/util-profiling-rules.c b/src/util-profiling-rules.c
index d41985adf2eb221c24c191c12c8115d19391f7ff..6c3f31d967a2d25ae159583fb21b48953d92c44c 100644 (file)
--- a/src/util-profiling-rules.c
+++ b/src/util-profiling-rules.c
@@ -55,7 +55,7 @@ typedef struct SCProfileData_ {
 
 typedef struct SCProfileDetectCtx_ {
     uint32_t size;
-    uint32_t id;
+    uint16_t id;
     SCProfileData *data;
     pthread_mutex_t data_m;
 } SCProfileDetectCtx;

diff --git a/src/util-profiling.c b/src/util-profiling.c
index faeb3b6cc2a344641bce411b312d6cfb6b50ee4c..b3c98fa55229fa707f2f026e907ca26a56e2a018 100644 (file)
--- a/src/util-profiling.c
+++ b/src/util-profiling.c
@@ -515,10 +515,10 @@ void SCProfilingDumpPacketStats(void)
             total += pd->tot;
         }
     }
-    for (m = 0; m < ALPROTO_MAX; m++) {
+    for (AppProto a = 0; a < ALPROTO_MAX; a++) {
         int p;
         for (p = 0; p < 257; p++) {
-            SCProfilePacketData *pd = &packet_profile_app_data4[m][p];
+            SCProfilePacketData *pd = &packet_profile_app_data4[a][p];
 
             if (pd->cnt == 0) {
                 continue;
@@ -528,15 +528,18 @@ void SCProfilingDumpPacketStats(void)
             double percent = (long double)pd->tot /
                 (long double)total * 100;
 
-            fprintf(fp, "%-20s    IPv4     %3d  %12"PRIu64"     %12"PRIu64"   %12"PRIu64"  %12"PRIu64"  %12s  %-6.2f\n",
-                    AppProtoToString(m), p, pd->cnt, pd->min, pd->max, (uint64_t)(pd->tot / pd->cnt), totalstr, percent);
+            fprintf(fp,
+                    "%-20s    IPv4     %3d  %12" PRIu64 "     %12" PRIu64 "   %12" PRIu64
+                    "  %12" PRIu64 "  %12s  %-6.2f\n",
+                    AppProtoToString(a), p, pd->cnt, pd->min, pd->max,
+                    (uint64_t)(pd->tot / pd->cnt), totalstr, percent);
         }
     }
 
-    for (m = 0; m < ALPROTO_MAX; m++) {
+    for (AppProto a = 0; a < ALPROTO_MAX; a++) {
         int p;
         for (p = 0; p < 257; p++) {
-            SCProfilePacketData *pd = &packet_profile_app_data6[m][p];
+            SCProfilePacketData *pd = &packet_profile_app_data6[a][p];
 
             if (pd->cnt == 0) {
                 continue;
@@ -546,8 +549,11 @@ void SCProfilingDumpPacketStats(void)
             double percent = (long double)pd->tot /
                 (long double)total * 100;
 
-            fprintf(fp, "%-20s    IPv6     %3d  %12"PRIu64"     %12"PRIu64"   %12"PRIu64"  %12"PRIu64"  %12s  %-6.2f\n",
-                    AppProtoToString(m), p, pd->cnt, pd->min, pd->max, (uint64_t)(pd->tot / pd->cnt), totalstr, percent);
+            fprintf(fp,
+                    "%-20s    IPv6     %3d  %12" PRIu64 "     %12" PRIu64 "   %12" PRIu64
+                    "  %12" PRIu64 "  %12s  %-6.2f\n",
+                    AppProtoToString(a), p, pd->cnt, pd->min, pd->max,
+                    (uint64_t)(pd->tot / pd->cnt), totalstr, percent);
         }
     }