warning: explicit casts to double

pull/6642/head
Philippe Antoine 4 years ago committed by Victor Julien
parent b88f015bfb
commit 46981ccd98

@ -2404,14 +2404,12 @@ static void HTPConfigSetDefaultsPhase2(const char *name, HTPCfgRec *cfg_prec)
int rdrange = cfg_prec->randomize_range; int rdrange = cfg_prec->randomize_range;
long int r = RandomGetWrap(); long int r = RandomGetWrap();
cfg_prec->request.inspect_min_size += cfg_prec->request.inspect_min_size += (int)(cfg_prec->request.inspect_min_size *
(int) (cfg_prec->request.inspect_min_size * ((double)r / RAND_MAX - 0.5) * rdrange / 100);
(r * 1.0 / RAND_MAX - 0.5) * rdrange / 100);
r = RandomGetWrap(); r = RandomGetWrap();
cfg_prec->request.inspect_window += cfg_prec->request.inspect_window += (int)(cfg_prec->request.inspect_window *
(int) (cfg_prec->request.inspect_window * ((double)r / RAND_MAX - 0.5) * rdrange / 100);
(r * 1.0 / RAND_MAX - 0.5) * rdrange / 100);
SCLogConfig("'%s' server has 'request-body-minimal-inspect-size' set to" SCLogConfig("'%s' server has 'request-body-minimal-inspect-size' set to"
" %d and 'request-body-inspect-window' set to %d after" " %d and 'request-body-inspect-window' set to %d after"
" randomization.", " randomization.",
@ -2421,14 +2419,12 @@ static void HTPConfigSetDefaultsPhase2(const char *name, HTPCfgRec *cfg_prec)
r = RandomGetWrap(); r = RandomGetWrap();
cfg_prec->response.inspect_min_size += cfg_prec->response.inspect_min_size += (int)(cfg_prec->response.inspect_min_size *
(int) (cfg_prec->response.inspect_min_size * ((double)r / RAND_MAX - 0.5) * rdrange / 100);
(r * 1.0 / RAND_MAX - 0.5) * rdrange / 100);
r = RandomGetWrap(); r = RandomGetWrap();
cfg_prec->response.inspect_window += cfg_prec->response.inspect_window += (int)(cfg_prec->response.inspect_window *
(int) (cfg_prec->response.inspect_window * ((double)r / RAND_MAX - 0.5) * rdrange / 100);
(r * 1.0 / RAND_MAX - 0.5) * rdrange / 100);
SCLogConfig("'%s' server has 'response-body-minimal-inspect-size' set to" SCLogConfig("'%s' server has 'response-body-minimal-inspect-size' set to"
" %d and 'response-body-inspect-window' set to %d after" " %d and 'response-body-inspect-window' set to %d after"

@ -597,8 +597,8 @@ void StreamTcpInitConfig(bool quiet)
if (randomize) { if (randomize) {
long int r = RandomGetWrap(); long int r = RandomGetWrap();
stream_config.reassembly_toserver_chunk_size += stream_config.reassembly_toserver_chunk_size +=
(int) (stream_config.reassembly_toserver_chunk_size * (int)(stream_config.reassembly_toserver_chunk_size * ((double)r / RAND_MAX - 0.5) *
(r * 1.0 / RAND_MAX - 0.5) * rdrange / 100); rdrange / 100);
} }
const char *temp_stream_reassembly_toclient_chunk_size_str; const char *temp_stream_reassembly_toclient_chunk_size_str;
if (ConfGetValue("stream.reassembly.toclient-chunk-size", if (ConfGetValue("stream.reassembly.toclient-chunk-size",
@ -619,8 +619,8 @@ void StreamTcpInitConfig(bool quiet)
if (randomize) { if (randomize) {
long int r = RandomGetWrap(); long int r = RandomGetWrap();
stream_config.reassembly_toclient_chunk_size += stream_config.reassembly_toclient_chunk_size +=
(int) (stream_config.reassembly_toclient_chunk_size * (int)(stream_config.reassembly_toclient_chunk_size * ((double)r / RAND_MAX - 0.5) *
(r * 1.0 / RAND_MAX - 0.5) * rdrange / 100); rdrange / 100);
} }
if (!quiet) { if (!quiet) {
SCLogConfig("stream.reassembly \"toserver-chunk-size\": %"PRIu16, SCLogConfig("stream.reassembly \"toserver-chunk-size\": %"PRIu16,

@ -33,7 +33,8 @@
#define CLOCK_END clo2 = clock() #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) #define GET_CLOCK_END_SECS ((clo1 - clo2)/(double)CLOCKS_PER_SEC)

@ -351,11 +351,10 @@ int LiveDeviceListClean()
TAILQ_FOREACH_SAFE(pd, &live_devices, next, tpd) { TAILQ_FOREACH_SAFE(pd, &live_devices, next, tpd) {
if (live_devices_stats) { if (live_devices_stats) {
SCLogNotice("Stats for '%s': pkts: %" PRIu64", drop: %" PRIu64 " (%.2f%%), invalid chksum: %" PRIu64, SCLogNotice("Stats for '%s': pkts: %" PRIu64 ", drop: %" PRIu64
pd->dev, " (%.2f%%), invalid chksum: %" PRIu64,
SC_ATOMIC_GET(pd->pkts), pd->dev, SC_ATOMIC_GET(pd->pkts), SC_ATOMIC_GET(pd->drop),
SC_ATOMIC_GET(pd->drop), 100 * ((double)SC_ATOMIC_GET(pd->drop)) / (double)SC_ATOMIC_GET(pd->pkts),
100 * (SC_ATOMIC_GET(pd->drop) * 1.0) / SC_ATOMIC_GET(pd->pkts),
SC_ATOMIC_GET(pd->invalid_checksums)); SC_ATOMIC_GET(pd->invalid_checksums));
} }

@ -372,7 +372,12 @@ void PoolReturn(Pool *p, void *data)
void PoolPrintSaturation(Pool *p) 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)));
} }
/* /*

Loading…
Cancel
Save