aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sizeof printf related compiler warnings.

Browse Source
remotes/origin/master-1.0.x
Victor Julien 16 years ago
parent fa5939ca91
commit 5501212e62
10 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

6
src/detect-engine-address.c
Unescape Escape View File

@ -98,19 +98,19 @@ void DetectAddressGroupFree(DetectAddressGroup *ag) {
}
void DetectAddressGroupPrintMemory(void) {
printf(" * Address group memory stats (DetectAddressGroup %" PRIuMAX "):\n", sizeof(DetectAddressGroup));
printf(" * Address group memory stats (DetectAddressGroup %" PRIuMAX "):\n", (uintmax_t)sizeof(DetectAddressGroup));
printf(" - detect_address_group_memory %" PRIu32 "\n", detect_address_group_memory);
printf(" - detect_address_group_init_cnt %" PRIu32 "\n", detect_address_group_init_cnt);
printf(" - detect_address_group_free_cnt %" PRIu32 "\n", detect_address_group_free_cnt);
printf(" - outstanding groups %" PRIu32 "\n", detect_address_group_init_cnt - detect_address_group_free_cnt);
printf(" * Address group memory stats done\n");
printf(" * Address group head memory stats (DetectAddressGroupsHead %" PRIuMAX "):\n", sizeof(DetectAddressGroupsHead));
printf(" * Address group head memory stats (DetectAddressGroupsHead %" PRIuMAX "):\n", (uintmax_t)sizeof(DetectAddressGroupsHead));
printf(" - detect_address_group_head_memory %" PRIu32 "\n", detect_address_group_head_memory);
printf(" - detect_address_group_head_init_cnt %" PRIu32 "\n", detect_address_group_head_init_cnt);
printf(" - detect_address_group_head_free_cnt %" PRIu32 "\n", detect_address_group_head_free_cnt);
printf(" - outstanding groups %" PRIu32 "\n", detect_address_group_head_init_cnt - detect_address_group_head_free_cnt);
printf(" * Address group head memory stats done\n");
printf(" * Address memory stats (DetectAddressData %" PRIuMAX "):\n", sizeof(DetectAddressData));
printf(" * Address memory stats (DetectAddressData %" PRIuMAX "):\n", (uintmax_t)sizeof(DetectAddressData));
printf(" - detect_address_memory %" PRIu32 "\n", detect_address_memory);
printf(" - detect_address_init_cnt %" PRIu32 "\n", detect_address_init_cnt);
printf(" - detect_address_free_cnt %" PRIu32 "\n", detect_address_free_cnt);

2
src/detect-engine-port.c
Unescape Escape View File

@ -76,7 +76,7 @@ void DetectPortFree(DetectPort *dp) {
}
void DetectPortPrintMemory(void) {
printf(" * Port memory stats (DetectPort %" PRIuMAX "):\n", sizeof(DetectPort));
printf(" * Port memory stats (DetectPort %" PRIuMAX "):\n", (uintmax_t)sizeof(DetectPort));
printf(" - detect_port_memory %" PRIu32 "\n", detect_port_memory);
printf(" - detect_port_init_cnt %" PRIu32 "\n", detect_port_init_cnt);
printf(" - detect_port_free_cnt %" PRIu32 "\n", detect_port_free_cnt);

2
src/detect-engine-siggroup.c
Unescape Escape View File

@ -487,7 +487,7 @@ void SigGroupHeadSetSigCnt(SigGroupHead *sgh, uint32_t max_idx) {
}
void DetectSigGroupPrintMemory(void) {
printf(" * Sig group head memory stats (SigGroupHead %" PRIuMAX "):\n", sizeof(SigGroupHead));
printf(" * Sig group head memory stats (SigGroupHead %" PRIuMAX "):\n", (uintmax_t)sizeof(SigGroupHead));
printf(" - detect_siggroup_head_memory %" PRIu32 "\n", detect_siggroup_head_memory);
printf(" - detect_siggroup_head_init_cnt %" PRIu32 "\n", detect_siggroup_head_init_cnt);
printf(" - detect_siggroup_head_free_cnt %" PRIu32 "\n", detect_siggroup_head_free_cnt);

4
src/detect.c
Unescape Escape View File

@ -2145,8 +2145,8 @@ int SigAddressPrepareStage3(DetectEngineCtx *de_ctx) {
if (!(de_ctx->flags & DE_QUIET)) {
printf("* MPM memory %" PRIuMAX " (dynamic %" PRIu32 ", ctxs %" PRIuMAX ", avg per ctx %" PRIu32 ")\n",
de_ctx->mpm_memory_size + ((de_ctx->mpm_unique + de_ctx->mpm_uri_unique) * sizeof(MpmCtx)),
de_ctx->mpm_memory_size, ((de_ctx->mpm_unique + de_ctx->mpm_uri_unique) * sizeof(MpmCtx)),
de_ctx->mpm_memory_size + ((de_ctx->mpm_unique + de_ctx->mpm_uri_unique) * (uintmax_t)sizeof(MpmCtx)),
de_ctx->mpm_memory_size, ((de_ctx->mpm_unique + de_ctx->mpm_uri_unique) * (uintmax_t)sizeof(MpmCtx)),
de_ctx->mpm_unique ? de_ctx->mpm_memory_size / de_ctx->mpm_unique: 0);
printf(" * Max sig id %" PRIu32 ", array size %" PRIu32 "\n", DetectEngineGetMaxSigId(de_ctx), DetectEngineGetMaxSigId(de_ctx) / 8 + 1);

4
src/eidps.c
Unescape Escape View File

@ -966,7 +966,7 @@ int main(int argc, char **argv)
memset(&trans_q, 0,sizeof(trans_q));
/* pre allocate packets */
printf("Preallocating packets... packet size %" PRIuMAX "\n", sizeof(Packet));
printf("Preallocating packets... packet size %" PRIuMAX "\n", (uintmax_t)sizeof(Packet));
int i = 0;
for (i = 0; i < MAX_PENDING; i++) {
/* XXX pkt alloc function */
@ -1050,7 +1050,7 @@ int main(int argc, char **argv)
memset(&end_time, 0, sizeof(end_time));
gettimeofday(&end_time, NULL);
printf("time elapsed %" PRIu64 "s\n", end_time.tv_sec - start_time.tv_sec);
printf("time elapsed %" PRIuMAX "s\n", (uintmax_t)(end_time.tv_sec - start_time.tv_sec));
TmThreadKillThreads();

4
src/flow.c
Unescape Escape View File

@ -303,7 +303,7 @@ void FlowInitConfig (char quiet)
if (quiet == FALSE)
printf("* Allocated %" PRIu32 " bytes of memory for the flow hash... %" PRIu32 " buckets of size %" PRIuMAX "\n",
flow_config.memuse, flow_config.hash_size, sizeof(FlowBucket));
flow_config.memuse, flow_config.hash_size, (uintmax_t)sizeof(FlowBucket));
/* pre allocate flows */
uint32_t i = 0;
@ -318,7 +318,7 @@ void FlowInitConfig (char quiet)
if (quiet == FALSE) {
printf("* Preallocated %" PRIu32 " flows of size %" PRIuMAX "\n",
flow_spare_q.len, sizeof(Flow));
flow_spare_q.len, (uintmax_t)sizeof(Flow));
printf("* Flow memory usage: %" PRIu32 " bytes. Maximum: %" PRIu32 "\n",
flow_config.memuse, flow_config.memcap);
}

8
src/stream-tcp-reassemble.c
Unescape Escape View File

@ -946,8 +946,8 @@ int StreamTcpReassembleHandleSegmentUpdateACK (TcpSession *ssn, TcpStream *strea
if (copy_size > payload_len) {
copy_size = payload_len;
}
if (copy_size > sizeof (smsg->data.data)) {
printf("BUG(%" PRIu32 "): copy_size %" PRIu32 " > sizeof(smsg->data.data) %" PRIuMAX "\n", __LINE__, copy_size, sizeof (smsg->data.data));
if (copy_size > sizeof(smsg->data.data)) {
printf("BUG(%" PRIu32 "): copy_size %" PRIu32 " > sizeof(smsg->data.data) %" PRIuMAX "\n", __LINE__, copy_size, (uintmax_t)sizeof(smsg->data.data));
abort();
}
printf("StreamTcpReassembleHandleSegmentUpdateACK: copy_size %" PRIu32 " "
@ -1003,8 +1003,8 @@ int StreamTcpReassembleHandleSegmentUpdateACK (TcpSession *ssn, TcpStream *strea
if (copy_size > (seg->payload_len - payload_offset)) {
copy_size = (seg->payload_len - payload_offset);
}
if (copy_size > sizeof (smsg->data.data)) {
printf("BUG(%" PRIu32 "): copy_size %" PRIu32 " > sizeof(smsg->data.data) %" PRIuMAX "\n", __LINE__, copy_size, sizeof (smsg->data.data));
if (copy_size > sizeof(smsg->data.data)) {
printf("BUG(%" PRIu32 "): copy_size %" PRIu32 " > sizeof(smsg->data.data) %" PRIuMAX "\n", __LINE__, copy_size, (uintmax_t)sizeof(smsg->data.data));
abort();
}

8
src/util-mpm-b2g.c
Unescape Escape View File

@ -132,10 +132,10 @@ void B2gPrintInfo(MpmCtx *mpm_ctx) {
printf("Memory allocs: %" PRIu32 "\n", mpm_ctx->memory_cnt);
printf("Memory alloced: %" PRIu32 "\n", mpm_ctx->memory_size);
printf(" Sizeofs:\n");
printf(" MpmCtx %" PRIuMAX "\n", sizeof(MpmCtx));
printf(" B2gCtx: %" PRIuMAX "\n", sizeof(B2gCtx));
printf(" B2gPattern %" PRIuMAX "\n", sizeof(B2gPattern));
printf(" B2gHashItem %" PRIuMAX "\n", sizeof(B2gHashItem));
printf(" MpmCtx %" PRIuMAX "\n", (uintmax_t)sizeof(MpmCtx));
printf(" B2gCtx: %" PRIuMAX "\n", (uintmax_t)sizeof(B2gCtx));
printf(" B2gPattern %" PRIuMAX "\n", (uintmax_t)sizeof(B2gPattern));
printf(" B2gHashItem %" PRIuMAX "\n", (uintmax_t)sizeof(B2gHashItem));
printf("Unique Patterns: %" PRIu32 "\n", mpm_ctx->pattern_cnt);
printf("Scan Patterns: %" PRIu32 "\n", mpm_ctx->scan_pattern_cnt);
printf("Total Patterns: %" PRIu32 "\n", mpm_ctx->total_pattern_cnt);

8
src/util-mpm-b3g.c
Unescape Escape View File

@ -127,10 +127,10 @@ void B3gPrintInfo(MpmCtx *mpm_ctx) {
printf("Memory allocs: %" PRIu32 "\n", mpm_ctx->memory_cnt);
printf("Memory alloced: %" PRIu32 "\n", mpm_ctx->memory_size);
printf(" Sizeofs:\n");
printf(" MpmCtx %" PRIuMAX "\n", sizeof(MpmCtx));
printf(" B3gCtx: %" PRIuMAX "\n", sizeof(B3gCtx));
printf(" B3gPattern %" PRIuMAX "\n", sizeof(B3gPattern));
printf(" B3gHashItem %" PRIuMAX "\n", sizeof(B3gHashItem));
printf(" MpmCtx %" PRIuMAX "\n", (uintmax_t)sizeof(MpmCtx));
printf(" B3gCtx: %" PRIuMAX "\n", (uintmax_t)sizeof(B3gCtx));
printf(" B3gPattern %" PRIuMAX "\n", (uintmax_t)sizeof(B3gPattern));
printf(" B3gHashItem %" PRIuMAX "\n", (uintmax_t)sizeof(B3gHashItem));
printf("Unique Patterns: %" PRIu32 "\n", mpm_ctx->pattern_cnt);
printf("Scan Patterns: %" PRIu32 "\n", mpm_ctx->scan_pattern_cnt);
printf("Total Patterns: %" PRIu32 "\n", mpm_ctx->total_pattern_cnt);

8
src/util-mpm-wumanber.c
Unescape Escape View File

@ -155,10 +155,10 @@ void WmPrintInfo(MpmCtx *mpm_ctx) {
printf("Memory allocs: %" PRIu32 "\n", mpm_ctx->memory_cnt);
printf("Memory alloced: %" PRIu32 "\n", mpm_ctx->memory_size);
printf(" Sizeofs:\n");
printf(" MpmCtx %" PRIuMAX "\n", sizeof(MpmCtx));
printf(" WmCtx: %" PRIuMAX "\n", sizeof(WmCtx));
printf(" WmPattern %" PRIuMAX "\n", sizeof(WmPattern));
printf(" WmHashItem %" PRIuMAX "\n", sizeof(WmHashItem));
printf(" MpmCtx %" PRIuMAX "\n", (uintmax_t)sizeof(MpmCtx));
printf(" WmCtx: %" PRIuMAX "\n", (uintmax_t)sizeof(WmCtx));
printf(" WmPattern %" PRIuMAX "\n", (uintmax_t)sizeof(WmPattern));
printf(" WmHashItem %" PRIuMAX "\n", (uintmax_t)sizeof(WmHashItem));
printf("Unique Patterns: %" PRIu32 "\n", mpm_ctx->pattern_cnt);
printf("Scan Patterns: %" PRIu32 "\n", mpm_ctx->scan_pattern_cnt);
printf("Total Patterns: %" PRIu32 "\n", mpm_ctx->total_pattern_cnt);

Write Preview
Loading…
Cancel
Save