Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

One more small serialization format fix to make gcc 4.9 happy.

Browse source
This commit is contained in:
Johanna Amann 2016-08-15 15:19:50 -07:00
parent 5c0d8c649a
commit 697b68ab01
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/SerializationFormat.cc
View file

@ -138,7 +138,7 @@ bool BinarySerializationFormat::Read(int64* v, const char* tag)
return false; return false;
*v = ((int64(ntohl(x[0]))) << 32) | ntohl(x[1]); *v = ((int64(ntohl(x[0]))) << 32) | ntohl(x[1]);
DBG_LOG(DBG_SERIAL, "Read int64 %lld [%s]", *v, tag); DBG_LOG(DBG_SERIAL, "Read int64 %" PRId64 " [%s]", *v, tag);
return true; return true;
} }
@ -149,7 +149,7 @@ bool BinarySerializationFormat::Read(uint64* v, const char* tag)
return false; return false;
*v = ((uint64(ntohl(x[0]))) << 32) | ntohl(x[1]); *v = ((uint64(ntohl(x[0]))) << 32) | ntohl(x[1]);
DBG_LOG(DBG_SERIAL, "Read uint64 %llu [%s]", *v, tag); DBG_LOG(DBG_SERIAL, "Read uint64 %" PRIu64 " [%s]", *v, tag);
return true; return true;
} }
@ -327,7 +327,7 @@ bool BinarySerializationFormat::Write(int v, const char* tag)
bool BinarySerializationFormat::Write(uint64 v, const char* tag) bool BinarySerializationFormat::Write(uint64 v, const char* tag)
{ {
DBG_LOG(DBG_SERIAL, "Write uint64 %llu [%s]", v, tag); DBG_LOG(DBG_SERIAL, "Write uint64 %" PRIu64 " [%s]", v, tag);
uint32 x[2]; uint32 x[2];
x[0] = htonl(v >> 32); x[0] = htonl(v >> 32);
x[1] = htonl(v & 0xffffffff); x[1] = htonl(v & 0xffffffff);
@ -336,7 +336,7 @@ bool BinarySerializationFormat::Write(uint64 v, const char* tag)
bool BinarySerializationFormat::Write(int64 v, const char* tag) bool BinarySerializationFormat::Write(int64 v, const char* tag)
{ {
DBG_LOG(DBG_SERIAL, "Write int64 %lld [%s]", v, tag); DBG_LOG(DBG_SERIAL, "Write int64 %" PRId64 " [%s]", v, tag);
uint32 x[2]; uint32 x[2];
x[0] = htonl(v >> 32); x[0] = htonl(v >> 32);
x[1] = htonl(v & 0xffffffff); x[1] = htonl(v & 0xffffffff);