tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace bswap with proper endian functions

Browse Source 
Reviewers: teon.banek

Reviewed By: teon.banek

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2290
This commit is contained in:
Matej Ferencevic
2019-08-07 13:45:57 +02:00
parent 134525851b
commit fb6dc83ef4
8 changed files with 76 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/communication/bolt/v1/decoder/decoder.hpp
View File

@@ -6,8 +6,8 @@
#include "communication/bolt/v1/codes.hpp"
#include "communication/bolt/v1/value.hpp"
#include "utils/bswap.hpp"
#include "utils/cast.hpp"
#include "utils/endian.hpp"
namespace communication::bolt {
@@ -186,18 +186,18 @@ class Decoder {
if (!buffer_.Read(reinterpret_cast<uint8_t *>(&tmp), sizeof(tmp))) {
return false;
}
ret = utils::Bswap(tmp);
ret = utils::BigEndianToHost(tmp);
} else if (marker == Marker::Int32) {
int32_t tmp;
if (!buffer_.Read(reinterpret_cast<uint8_t *>(&tmp), sizeof(tmp))) {
return false;
}
ret = utils::Bswap(tmp);
ret = utils::BigEndianToHost(tmp);
} else if (marker == Marker::Int64) {
if (!buffer_.Read(reinterpret_cast<uint8_t *>(&ret), sizeof(ret))) {
return false;
}
ret = utils::Bswap(ret);
ret = utils::BigEndianToHost(ret);
} else {
return false;
}
@@ -212,7 +212,7 @@ class Decoder {
if (!buffer_.Read(reinterpret_cast<uint8_t *>(&value), sizeof(value))) {
return false;
}
value = utils::Bswap(value);
value = utils::BigEndianToHost(value);
ret = utils::MemcpyCast<double>(value);
*data = Value(ret);
return true;
@@ -233,14 +233,14 @@ class Decoder {
if (!buffer_.Read(reinterpret_cast<uint8_t *>(&tmp), sizeof(tmp))) {
return -1;
}
tmp = utils::Bswap(tmp);
tmp = utils::BigEndianToHost(tmp);
return tmp;
} else if (marker == Marker32[type]) {
uint32_t tmp;
if (!buffer_.Read(reinterpret_cast<uint8_t *>(&tmp), sizeof(tmp))) {
return -1;
}
tmp = utils::Bswap(tmp);
tmp = utils::BigEndianToHost(tmp);
return tmp;
} else {
return -1;

4
src/communication/bolt/v1/encoder/base_encoder.hpp
View File

@@ -4,8 +4,8 @@
#include "communication/bolt/v1/codes.hpp"
#include "communication/bolt/v1/value.hpp"
#include "utils/bswap.hpp"
#include "utils/cast.hpp"
#include "utils/endian.hpp"
static_assert(std::is_same_v<std::uint8_t, char> ||
std::is_same_v<std::uint8_t, unsigned char>,
@@ -216,7 +216,7 @@ class BaseEncoder {
private:
template <class T>
void WritePrimitiveValue(T value) {
value = utils::Bswap(value);
value = utils::HostToBigEndian(value);
WriteRAW(reinterpret_cast<const uint8_t *>(&value), sizeof(value));
}
};

1
src/communication/bolt/v1/encoder/chunked_encoder_buffer.hpp
View File

@@ -8,7 +8,6 @@
#include <glog/logging.h>
#include "communication/bolt/v1/constants.hpp"
#include "utils/bswap.hpp"
namespace communication::bolt {