Using NDPI_I64_FORMAT, NDPI_U64_FORMAT format string to differentiate between Windows and non-Windows.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2020-09-18 19:46:20 +02:00
parent bcce122665
commit d0052fd5b2
+16 -8
View File
@@ -39,6 +39,14 @@
#include <sys/endian.h>
#endif
#ifdef WIN32
#define NDPI_I64_FORMAT "%" PRId64
#define NDPI_U64_FORMAT "%" PRIu64
#else
#define NDPI_I64_FORMAT "%lld"
#define NDPI_U64_FORMAT "%llu"
#endif
/* ********************************** */
u_int64_t ndpi_htonll(u_int64_t v) {
@@ -804,7 +812,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
serializer->status.buffer.size_used += snprintf((char *)
&serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
"%" PRIu64, (unsigned long long)value);
NDPI_U64_FORMAT, (unsigned long long)value);
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
@@ -813,7 +821,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
serializer->status.buffer.size_used += snprintf((char *)
&serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
"%" PRIu64, (unsigned long long)value);
NDPI_U64_FORMAT, (unsigned long long)value);
} else {
if(value <= 0xffffffff) {
return(ndpi_serialize_uint32_uint32(_serializer, key, value));
@@ -936,7 +944,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
serializer->status.buffer.size_used += snprintf((char *)
&serializer->buffer.data[serializer->status.buffer.size_used],
buff_diff, "%" PRId64, (long long int)value);
buff_diff, NDPI_I64_FORMAT, (long long int)value);
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
@@ -945,7 +953,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
serializer->status.buffer.size_used += snprintf((char *)
&serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
"%" PRId64, (long long int)value);
NDPI_I64_FORMAT, (long long int)value);
}
else {
if((value & 0xFFFFFFFF) == value) {
@@ -1257,7 +1265,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
serializer->status.buffer.size_used += snprintf((char *)
&serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
"%" PRId64, (long long int)value);
NDPI_I64_FORMAT, (long long int)value);
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
@@ -1265,7 +1273,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
ndpi_serialize_csv_pre(serializer);
buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
serializer->status.buffer.size_used += snprintf((char *) &serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
"%" PRId64, (long long int)value);
NDPI_I64_FORMAT, (long long int)value);
} else {
if ((value & 0xFFFFFFFF) == value) {
return(ndpi_serialize_string_int32(_serializer, key, value));
@@ -1430,7 +1438,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
serializer->status.buffer.size_used += snprintf((char *)
&serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
"%" PRIu64, (unsigned long long)value);
NDPI_U64_FORMAT, (unsigned long long)value);
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
@@ -1439,7 +1447,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
serializer->status.buffer.size_used += snprintf((char *)
&serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
"%" PRIu64, (unsigned long long)value);
NDPI_U64_FORMAT, (unsigned long long)value);
} else {
if(value <= 0xffffffff) {
return(ndpi_serialize_string_uint32(_serializer, key, value));