From: Philippe Antoine Date: Sat, 23 Oct 2021 10:23:14 +0000 (+0200) Subject: warning: explicit casts to double X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fsuricata.git;a=commitdiff_plain;h=46981ccd98962119960b1f40e5d413bdb61c8517 warning: explicit casts to double --- diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c index 3b127ac63..730dce8b4 100644 --- a/src/app-layer-htp.c +++ b/src/app-layer-htp.c @@ -2404,14 +2404,12 @@ static void HTPConfigSetDefaultsPhase2(const char *name, HTPCfgRec *cfg_prec) int rdrange = cfg_prec->randomize_range; long int r = RandomGetWrap(); - cfg_prec->request.inspect_min_size += - (int) (cfg_prec->request.inspect_min_size * - (r * 1.0 / RAND_MAX - 0.5) * rdrange / 100); + cfg_prec->request.inspect_min_size += (int)(cfg_prec->request.inspect_min_size * + ((double)r / RAND_MAX - 0.5) * rdrange / 100); r = RandomGetWrap(); - cfg_prec->request.inspect_window += - (int) (cfg_prec->request.inspect_window * - (r * 1.0 / RAND_MAX - 0.5) * rdrange / 100); + cfg_prec->request.inspect_window += (int)(cfg_prec->request.inspect_window * + ((double)r / RAND_MAX - 0.5) * rdrange / 100); SCLogConfig("'%s' server has 'request-body-minimal-inspect-size' set to" " %d and 'request-body-inspect-window' set to %d after" " randomization.", @@ -2421,14 +2419,12 @@ static void HTPConfigSetDefaultsPhase2(const char *name, HTPCfgRec *cfg_prec) r = RandomGetWrap(); - cfg_prec->response.inspect_min_size += - (int) (cfg_prec->response.inspect_min_size * - (r * 1.0 / RAND_MAX - 0.5) * rdrange / 100); + cfg_prec->response.inspect_min_size += (int)(cfg_prec->response.inspect_min_size * + ((double)r / RAND_MAX - 0.5) * rdrange / 100); r = RandomGetWrap(); - cfg_prec->response.inspect_window += - (int) (cfg_prec->response.inspect_window * - (r * 1.0 / RAND_MAX - 0.5) * rdrange / 100); + cfg_prec->response.inspect_window += (int)(cfg_prec->response.inspect_window * + ((double)r / RAND_MAX - 0.5) * rdrange / 100); SCLogConfig("'%s' server has 'response-body-minimal-inspect-size' set to" " %d and 'response-body-inspect-window' set to %d after" diff --git a/src/stream-tcp.c b/src/stream-tcp.c index 1cff19fa5..5392f397c 100644 --- a/src/stream-tcp.c +++ b/src/stream-tcp.c @@ -597,8 +597,8 @@ void StreamTcpInitConfig(bool quiet) if (randomize) { long int r = RandomGetWrap(); stream_config.reassembly_toserver_chunk_size += - (int) (stream_config.reassembly_toserver_chunk_size * - (r * 1.0 / RAND_MAX - 0.5) * rdrange / 100); + (int)(stream_config.reassembly_toserver_chunk_size * ((double)r / RAND_MAX - 0.5) * + rdrange / 100); } const char *temp_stream_reassembly_toclient_chunk_size_str; if (ConfGetValue("stream.reassembly.toclient-chunk-size", @@ -619,8 +619,8 @@ void StreamTcpInitConfig(bool quiet) if (randomize) { long int r = RandomGetWrap(); stream_config.reassembly_toclient_chunk_size += - (int) (stream_config.reassembly_toclient_chunk_size * - (r * 1.0 / RAND_MAX - 0.5) * rdrange / 100); + (int)(stream_config.reassembly_toclient_chunk_size * ((double)r / RAND_MAX - 0.5) * + rdrange / 100); } if (!quiet) { SCLogConfig("stream.reassembly \"toserver-chunk-size\": %"PRIu16, diff --git a/src/util-clock.h b/src/util-clock.h index e6e3517b9..0ac7a3207 100644 --- a/src/util-clock.h +++ b/src/util-clock.h @@ -33,7 +33,8 @@ #define CLOCK_END clo2 = clock() -#define CLOCK_PRINT_SEC printf("Seconds spent: %.4fs\n", ((clo2 - clo1)/(double)CLOCKS_PER_SEC)) +#define CLOCK_PRINT_SEC \ + printf("Seconds spent: %.4fs\n", ((double)(clo2 - clo1) / (double)CLOCKS_PER_SEC)) #define GET_CLOCK_END_SECS ((clo1 - clo2)/(double)CLOCKS_PER_SEC) diff --git a/src/util-device.c b/src/util-device.c index a303fa835..fc6336b3c 100644 --- a/src/util-device.c +++ b/src/util-device.c @@ -351,11 +351,10 @@ int LiveDeviceListClean() TAILQ_FOREACH_SAFE(pd, &live_devices, next, tpd) { if (live_devices_stats) { - SCLogNotice("Stats for '%s': pkts: %" PRIu64", drop: %" PRIu64 " (%.2f%%), invalid chksum: %" PRIu64, - pd->dev, - SC_ATOMIC_GET(pd->pkts), - SC_ATOMIC_GET(pd->drop), - 100 * (SC_ATOMIC_GET(pd->drop) * 1.0) / SC_ATOMIC_GET(pd->pkts), + SCLogNotice("Stats for '%s': pkts: %" PRIu64 ", drop: %" PRIu64 + " (%.2f%%), invalid chksum: %" PRIu64, + pd->dev, SC_ATOMIC_GET(pd->pkts), SC_ATOMIC_GET(pd->drop), + 100 * ((double)SC_ATOMIC_GET(pd->drop)) / (double)SC_ATOMIC_GET(pd->pkts), SC_ATOMIC_GET(pd->invalid_checksums)); } diff --git a/src/util-pool.c b/src/util-pool.c index ce55645d8..4a95afcee 100644 --- a/src/util-pool.c +++ b/src/util-pool.c @@ -372,7 +372,12 @@ void PoolReturn(Pool *p, void *data) void PoolPrintSaturation(Pool *p) { - SCLogDebug("pool %p is using %"PRIu32" out of %"PRIu32" items (%02.1f%%), max %"PRIu32" (%02.1f%%): pool struct memory %"PRIu64".", p, p->outstanding, p->max_buckets, (float)(p->outstanding/(float)(p->max_buckets))*100, p->max_outstanding, (float)(p->max_outstanding/(float)(p->max_buckets))*100, (uint64_t)(p->max_buckets * sizeof(PoolBucket))); + SCLogDebug("pool %p is using %" PRIu32 " out of %" PRIu32 " items (%02.1f%%), max %" PRIu32 + " (%02.1f%%): pool struct memory %" PRIu64 ".", + p, p->outstanding, p->max_buckets, + (float)(p->outstanding) / (float)(p->max_buckets) * 100, p->max_outstanding, + (float)(p->max_outstanding) / (float)(p->max_buckets) * 100, + (uint64_t)(p->max_buckets * sizeof(PoolBucket))); } /*