From daf3078279d0c8848f6abbb6683f2f03874587eb Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 16 Sep 2009 11:40:25 +0200 Subject: [PATCH] Fix compilation on 32bit --- src/detect-bytetest.c | 8 ++++---- src/util-byte.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/detect-bytetest.c b/src/detect-bytetest.c index 72f3d4fed8..cd4df7efde 100644 --- a/src/detect-bytetest.c +++ b/src/detect-bytetest.c @@ -657,11 +657,11 @@ int DetectBytetestTestParse13(void) { int DetectBytetestTestParse14(void) { int result = 0; DetectBytetestData *data = NULL; - data = DetectBytetestParse("23,=,0xffffffffffffffff,0,string,oct"); + data = DetectBytetestParse("23,=,0xffffffffffffffffULL,0,string,oct"); if (data != NULL) { if ( (data->op == DETECT_BYTETEST_OP_EQ) && (data->nbytes == 23) - && (data->value == 0xffffffffffffffff) + && (data->value == 0xffffffffffffffffULL) && (data->offset == 0) && (data->flags == DETECT_BYTETEST_STRING) && (data->base == DETECT_BYTETEST_BASE_OCT)) @@ -680,7 +680,7 @@ int DetectBytetestTestParse14(void) { int DetectBytetestTestParse15(void) { int result = 0; DetectBytetestData *data = NULL; - data = DetectBytetestParse("24, =, 0xffffffffffffffff, 0, string"); + data = DetectBytetestParse("24, =, 0xffffffffffffffffULL, 0, string"); if (data == NULL) { result = 1; } @@ -694,7 +694,7 @@ int DetectBytetestTestParse15(void) { int DetectBytetestTestParse16(void) { int result = 0; DetectBytetestData *data = NULL; - data = DetectBytetestParse("4,=,0,0xffffffffffffffff"); + data = DetectBytetestParse("4,=,0,0xffffffffffffffffULL"); if (data == NULL) { result = 1; } diff --git a/src/util-byte.c b/src/util-byte.c index 7606d22be0..266b11c407 100644 --- a/src/util-byte.c +++ b/src/util-byte.c @@ -390,8 +390,8 @@ static int ByteTest04 (void) { } static int ByteTest05 (void) { - uint64_t val = 0x0102030405060708; - uint64_t i64 = 0xbfbfbfbfbfbfbfbf; + uint64_t val = 0x0102030405060708ULL; + uint64_t i64 = 0xbfbfbfbfbfbfbfbfULL; uint8_t bytes[8] = { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 }; int ret = ByteExtractUint64(&i64, BYTE_LITTLE_ENDIAN, sizeof(bytes), bytes); @@ -403,8 +403,8 @@ static int ByteTest05 (void) { } static int ByteTest06 (void) { - uint64_t val = 0x0102030405060708; - uint64_t i64 = 0xbfbfbfbfbfbfbfbf; + uint64_t val = 0x0102030405060708ULL; + uint64_t i64 = 0xbfbfbfbfbfbfbfbfULL; uint8_t bytes[8] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }; int ret = ByteExtractUint64(&i64, BYTE_BIG_ENDIAN, sizeof(bytes), bytes); @@ -418,7 +418,7 @@ static int ByteTest06 (void) { static int ByteTest07 (void) { const char *str = "1234567890"; uint64_t val = 1234567890; - uint64_t i64 = 0xbfbfbfbfbfbfbfbf; + uint64_t i64 = 0xbfbfbfbfbfbfbfbfULL; int ret = ByteExtractStringUint64(&i64, 10, strlen(str), str); if ((ret == 10) && (i64 == val)) { @@ -470,7 +470,7 @@ static int ByteTest10 (void) { static int ByteTest11 (void) { const char *str = "-1234567890"; int64_t val = -1234567890; - int64_t i64 = 0xbfbfbfbfbfbfbfbf; + int64_t i64 = 0xbfbfbfbfbfbfbfbfULL; int ret = ByteExtractStringInt64(&i64, 10, strlen(str), str); if ((ret == 11) && (i64 == val)) {