diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-03-03 09:01:05 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-03-03 09:01:05 +0100 |
commit | 4d9746c828558c9f872e0aed52442863affb25d5 (patch) | |
tree | 507d7c2ba67f47d3cbbcf01a722236ff1b48426b /common/entitybuffer.cpp | |
parent | 9cea920b7dd51867a0be0fed2f461b6be73c103e (diff) | |
download | sink-4d9746c828558c9f872e0aed52442863affb25d5.tar.gz sink-4d9746c828558c9f872e0aed52442863affb25d5.zip |
Fromatted the whole codebase with clang-format.
clang-format -i */**{.cpp,.h}
Diffstat (limited to 'common/entitybuffer.cpp')
-rw-r--r-- | common/entitybuffer.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/common/entitybuffer.cpp b/common/entitybuffer.cpp index b4a5cb2..950bc46 100644 --- a/common/entitybuffer.cpp +++ b/common/entitybuffer.cpp | |||
@@ -6,8 +6,7 @@ | |||
6 | 6 | ||
7 | using namespace Sink; | 7 | using namespace Sink; |
8 | 8 | ||
9 | EntityBuffer::EntityBuffer(const void *dataValue, int dataSize) | 9 | EntityBuffer::EntityBuffer(const void *dataValue, int dataSize) : mEntity(nullptr) |
10 | : mEntity(nullptr) | ||
11 | { | 10 | { |
12 | flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(dataValue), dataSize); | 11 | flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(dataValue), dataSize); |
13 | // Q_ASSERT(Sink::VerifyEntity(verifyer)); | 12 | // Q_ASSERT(Sink::VerifyEntity(verifyer)); |
@@ -18,10 +17,8 @@ EntityBuffer::EntityBuffer(const void *dataValue, int dataSize) | |||
18 | } | 17 | } |
19 | } | 18 | } |
20 | 19 | ||
21 | EntityBuffer::EntityBuffer(const QByteArray &data) | 20 | EntityBuffer::EntityBuffer(const QByteArray &data) : EntityBuffer(data.constData(), data.size()) |
22 | : EntityBuffer(data.constData(), data.size()) | ||
23 | { | 21 | { |
24 | |||
25 | } | 22 | } |
26 | 23 | ||
27 | bool EntityBuffer::isValid() const | 24 | bool EntityBuffer::isValid() const |
@@ -35,7 +32,7 @@ const Sink::Entity &EntityBuffer::entity() | |||
35 | return *mEntity; | 32 | return *mEntity; |
36 | } | 33 | } |
37 | 34 | ||
38 | const uint8_t* EntityBuffer::resourceBuffer() | 35 | const uint8_t *EntityBuffer::resourceBuffer() |
39 | { | 36 | { |
40 | if (!mEntity) { | 37 | if (!mEntity) { |
41 | qDebug() << "no buffer"; | 38 | qDebug() << "no buffer"; |
@@ -44,7 +41,7 @@ const uint8_t* EntityBuffer::resourceBuffer() | |||
44 | return mEntity->resource()->Data(); | 41 | return mEntity->resource()->Data(); |
45 | } | 42 | } |
46 | 43 | ||
47 | const uint8_t* EntityBuffer::metadataBuffer() | 44 | const uint8_t *EntityBuffer::metadataBuffer() |
48 | { | 45 | { |
49 | if (!mEntity) { | 46 | if (!mEntity) { |
50 | return nullptr; | 47 | return nullptr; |
@@ -52,7 +49,7 @@ const uint8_t* EntityBuffer::metadataBuffer() | |||
52 | return mEntity->metadata()->Data(); | 49 | return mEntity->metadata()->Data(); |
53 | } | 50 | } |
54 | 51 | ||
55 | const uint8_t* EntityBuffer::localBuffer() | 52 | const uint8_t *EntityBuffer::localBuffer() |
56 | { | 53 | { |
57 | if (!mEntity) { | 54 | if (!mEntity) { |
58 | return nullptr; | 55 | return nullptr; |
@@ -68,17 +65,18 @@ void EntityBuffer::extractResourceBuffer(void *dataValue, int dataSize, const st | |||
68 | } | 65 | } |
69 | } | 66 | } |
70 | 67 | ||
71 | flatbuffers::Offset<flatbuffers::Vector<uint8_t> > EntityBuffer::appendAsVector(flatbuffers::FlatBufferBuilder &fbb, void const *data, size_t size) | 68 | flatbuffers::Offset<flatbuffers::Vector<uint8_t>> EntityBuffer::appendAsVector(flatbuffers::FlatBufferBuilder &fbb, void const *data, size_t size) |
72 | { | 69 | { |
73 | //Since we do memcpy trickery, this will only work on little endian | 70 | // Since we do memcpy trickery, this will only work on little endian |
74 | assert(FLATBUFFERS_LITTLEENDIAN); | 71 | assert(FLATBUFFERS_LITTLEENDIAN); |
75 | uint8_t *rawDataPtr = Q_NULLPTR; | 72 | uint8_t *rawDataPtr = Q_NULLPTR; |
76 | const auto pos = fbb.CreateUninitializedVector<uint8_t>(size, &rawDataPtr); | 73 | const auto pos = fbb.CreateUninitializedVector<uint8_t>(size, &rawDataPtr); |
77 | std::memcpy((void*)rawDataPtr, data, size); | 74 | std::memcpy((void *)rawDataPtr, data, size); |
78 | return pos; | 75 | return pos; |
79 | } | 76 | } |
80 | 77 | ||
81 | void EntityBuffer::assembleEntityBuffer(flatbuffers::FlatBufferBuilder &fbb, void const *metadataData, size_t metadataSize, void const *resourceData, size_t resourceSize, void const *localData, size_t localSize) | 78 | void EntityBuffer::assembleEntityBuffer( |
79 | flatbuffers::FlatBufferBuilder &fbb, void const *metadataData, size_t metadataSize, void const *resourceData, size_t resourceSize, void const *localData, size_t localSize) | ||
82 | { | 80 | { |
83 | auto metadata = appendAsVector(fbb, metadataData, metadataSize); | 81 | auto metadata = appendAsVector(fbb, metadataData, metadataSize); |
84 | auto resource = appendAsVector(fbb, resourceData, resourceSize); | 82 | auto resource = appendAsVector(fbb, resourceData, resourceSize); |
@@ -86,4 +84,3 @@ void EntityBuffer::assembleEntityBuffer(flatbuffers::FlatBufferBuilder &fbb, voi | |||
86 | auto entity = Sink::CreateEntity(fbb, metadata, resource, local); | 84 | auto entity = Sink::CreateEntity(fbb, metadata, resource, local); |
87 | Sink::FinishEntityBuffer(fbb, entity); | 85 | Sink::FinishEntityBuffer(fbb, entity); |
88 | } | 86 | } |
89 | |||