diff options
-rw-r--r-- | src/dbuspolicy_serializer.cpp | 2 | ||||
-rw-r--r-- | src/internal/serializer.cpp | 12 | ||||
-rw-r--r-- | src/internal/serializer.hpp | 6 | ||||
-rw-r--r-- | src/internal/storage_backend_serialized.cpp | 2 | ||||
-rw-r--r-- | src/stest_load_perf.cpp | 2 | ||||
-rw-r--r-- | src/stest_performance.cpp | 2 | ||||
-rw-r--r-- | src/test-libdbuspolicy1-access-deny-gdi.cpp | 4 | ||||
-rw-r--r-- | src/test-libdbuspolicy1-method-gdi.cpp | 2 | ||||
-rw-r--r-- | src/test-libdbuspolicy1-ownership-deny-gdi.cpp | 2 | ||||
-rw-r--r-- | src/test-libdbuspolicy1-ownership-gdi.cpp | 2 | ||||
-rw-r--r-- | src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp | 2 | ||||
-rw-r--r-- | src/test-libdbuspolicy1-signal-gdi.cpp | 2 | ||||
-rw-r--r-- | src/test-serializer.cpp | 3 |
13 files changed, 21 insertions, 22 deletions
diff --git a/src/dbuspolicy_serializer.cpp b/src/dbuspolicy_serializer.cpp index c6f2bf4..b174461 100644 --- a/src/dbuspolicy_serializer.cpp +++ b/src/dbuspolicy_serializer.cpp @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) ldp_serializer::Serializer serializer; ofstream output(output_filename, ofstream::binary); - uint8_t *data = serializer.serialize(input_filename, output); + auto data = serializer.serialize(input_filename, output); if (output.fail()) { cout << "Write FAILED." << endl; diff --git a/src/internal/serializer.cpp b/src/internal/serializer.cpp index 4bd1d35..5595751 100644 --- a/src/internal/serializer.cpp +++ b/src/internal/serializer.cpp @@ -94,7 +94,7 @@ struct Serializer::type_helper<PolicyAccess> { static constexpr auto create_item = &FB::CreateItemAccess; }; -uint8_t* Serializer::serialize(const ldp_xml::StorageBackendXML &db, size_t &size) { +const uint8_t* Serializer::serialize(const ldp_xml::StorageBackendXML &db, size_t &size) { m_db = &db; auto own_set = serialize_set<PolicyOwn>(); @@ -109,13 +109,13 @@ uint8_t* Serializer::serialize(const ldp_xml::StorageBackendXML &db, size_t &siz access_set); m_builder.Finish(file, FB::FileIdentifier()); - uint8_t* buf = m_builder.GetBufferPointer(); + auto buf = m_builder.GetBufferPointer(); size = m_builder.GetSize(); return buf; } -uint8_t* Serializer::serialize(const std::string config_path, size_t &size) { +const uint8_t* Serializer::serialize(const std::string config_path, size_t &size) { tslog::init(tslog::ldp_log_level::DEFAULT); ldp_xml::StorageBackendXML xmlStorage; @@ -127,11 +127,11 @@ uint8_t* Serializer::serialize(const std::string config_path, size_t &size) { return serialize(xmlStorage, size); } -uint8_t *Serializer::serialize(const std::string config_path, std::ostream &output) { +const uint8_t *Serializer::serialize(const std::string config_path, std::ostream &output) { size_t size = 0; - uint8_t *buf = serialize(config_path, size); + auto buf = serialize(config_path, size); - output.write(reinterpret_cast<char *>(buf), size); + output.write(reinterpret_cast<const char *>(buf), size); return buf; } diff --git a/src/internal/serializer.hpp b/src/internal/serializer.hpp index fc27dad..466ceb6 100644 --- a/src/internal/serializer.hpp +++ b/src/internal/serializer.hpp @@ -82,9 +82,9 @@ namespace ldp_serializer -> FbOff<typename type_helper<TP>::set>; public: Serializer() : m_db(nullptr) {} - uint8_t *serialize(const ldp_xml::StorageBackendXML &db, size_t &size); - uint8_t *serialize(const std::string config_path, size_t &size); - uint8_t *serialize(const std::string config_path, std::ostream &output); + const uint8_t *serialize(const ldp_xml::StorageBackendXML &db, size_t &size); + const uint8_t *serialize(const std::string config_path, size_t &size); + const uint8_t *serialize(const std::string config_path, std::ostream &output); friend class SerializerTests; }; } diff --git a/src/internal/storage_backend_serialized.cpp b/src/internal/storage_backend_serialized.cpp index 450949f..725d488 100644 --- a/src/internal/storage_backend_serialized.cpp +++ b/src/internal/storage_backend_serialized.cpp @@ -321,7 +321,7 @@ bool StorageBackendSerialized::StorageBackendSerializedImpl::initFromXML(const c serializer.reset(new ldp_serializer::Serializer()); size_t serialized_size; - uint8_t *data = serializer->serialize(config_name, serialized_size); + auto data = serializer->serialize(config_name, serialized_size); if (nullptr == data) return false; diff --git a/src/stest_load_perf.cpp b/src/stest_load_perf.cpp index 61b5399..a2ce952 100644 --- a/src/stest_load_perf.cpp +++ b/src/stest_load_perf.cpp @@ -42,7 +42,7 @@ bool run_xml(const char *conf_file) { bool run_xml_plus_fb(const char *conf_file, bool verify) { Serializer serializer; size_t size; - const uint8_t *buff = serializer.serialize(conf_file, size); + auto buff = serializer.serialize(conf_file, size); if (verify) { auto verifier = flatbuffers::Verifier(buff, size); diff --git a/src/stest_performance.cpp b/src/stest_performance.cpp index 594f9f0..15b81c6 100644 --- a/src/stest_performance.cpp +++ b/src/stest_performance.cpp @@ -189,7 +189,7 @@ void run_x_times(std::function<void(void)> func, size_t times) { void run_fb(const char *conf_file, bool verify, size_t count, bool worst) { Serializer serializer; size_t size; - const uint8_t *buff = serializer.serialize(conf_file, size); + auto buff = serializer.serialize(conf_file, size); if (verify) { auto verifier = flatbuffers::Verifier(buff, size); diff --git a/src/test-libdbuspolicy1-access-deny-gdi.cpp b/src/test-libdbuspolicy1-access-deny-gdi.cpp index ad11668..9e97270 100644 --- a/src/test-libdbuspolicy1-access-deny-gdi.cpp +++ b/src/test-libdbuspolicy1-access-deny-gdi.cpp @@ -143,8 +143,8 @@ bool run_fb(const std::pair<TestBusSetup, TestBusSetup> access_test) { size_t size; - uint8_t *buff_sys = nullptr, *buff_ses = nullptr; - buff_sys = serializer.serialize(system_bus_setup.first.c_str(), size); + auto buff_sys = serializer.serialize(system_bus_setup.first.c_str(), size); + decltype(buff_sys) buff_ses = nullptr; if (session_bus_setup.first == "") buff_ses = serializer.serialize(session_bus_setup.first.c_str(), size); diff --git a/src/test-libdbuspolicy1-method-gdi.cpp b/src/test-libdbuspolicy1-method-gdi.cpp index 9bbe0b7..b52e9fd 100644 --- a/src/test-libdbuspolicy1-method-gdi.cpp +++ b/src/test-libdbuspolicy1-method-gdi.cpp @@ -125,7 +125,7 @@ bool run_fb() { ldp_serializer::Serializer serializer; size_t size; - const uint8_t *buff = serializer.serialize("tests/default_allow/system.conf", size); + auto buff = serializer.serialize("tests/default_allow/system.conf", size); ldp_serialized::StorageBackendSerialized storage; storage.initFromData(buff); diff --git a/src/test-libdbuspolicy1-ownership-deny-gdi.cpp b/src/test-libdbuspolicy1-ownership-deny-gdi.cpp index a950220..3f6817e 100644 --- a/src/test-libdbuspolicy1-ownership-deny-gdi.cpp +++ b/src/test-libdbuspolicy1-ownership-deny-gdi.cpp @@ -180,7 +180,7 @@ bool run_policy_db() { bool run_fb() { ldp_serializer::Serializer serializer; size_t size; - uint8_t *buff = serializer.serialize("tests/default_deny/system.conf", size); + auto buff = serializer.serialize("tests/default_deny/system.conf", size); ldp_serialized::StorageBackendSerialized storage; storage.initFromData(buff); diff --git a/src/test-libdbuspolicy1-ownership-gdi.cpp b/src/test-libdbuspolicy1-ownership-gdi.cpp index a2e190c..5c1ba60 100644 --- a/src/test-libdbuspolicy1-ownership-gdi.cpp +++ b/src/test-libdbuspolicy1-ownership-gdi.cpp @@ -103,7 +103,7 @@ bool run_policy_db() { bool run_fb() { ldp_serializer::Serializer serializer; size_t size; - uint8_t *buff = serializer.serialize("tests/default_allow/system.conf", size); + auto buff = serializer.serialize("tests/default_allow/system.conf", size); ldp_serialized::StorageBackendSerialized storage; storage.initFromData(buff); diff --git a/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp b/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp index dadd224..f4cf1aa 100644 --- a/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp +++ b/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp @@ -187,7 +187,7 @@ bool run_policy_db() { bool run_fb() { ldp_serializer::Serializer serializer; size_t size; - uint8_t *buff = serializer.serialize("tests/default_deny/system.conf", size); + auto buff = serializer.serialize("tests/default_deny/system.conf", size); ldp_serialized::StorageBackendSerialized storage; storage.initFromData(buff); diff --git a/src/test-libdbuspolicy1-signal-gdi.cpp b/src/test-libdbuspolicy1-signal-gdi.cpp index d7127cb..5da8633 100644 --- a/src/test-libdbuspolicy1-signal-gdi.cpp +++ b/src/test-libdbuspolicy1-signal-gdi.cpp @@ -82,7 +82,7 @@ bool run_policy_db() { bool run_fb() { ldp_serializer::Serializer serializer; size_t size; - uint8_t *buff = serializer.serialize("tests/default_allow/system.conf", size); + auto buff = serializer.serialize("tests/default_allow/system.conf", size); ldp_serialized::StorageBackendSerialized storage; storage.initFromData(buff); diff --git a/src/test-serializer.cpp b/src/test-serializer.cpp index 876ef52..1857988 100644 --- a/src/test-serializer.cpp +++ b/src/test-serializer.cpp @@ -321,9 +321,8 @@ class SerializerTests { const FB::File *file; void serialize_xml(const std::string &file_name) { - uint8_t *buff; size_t size; - buff = serializer.serialize(file_name, size); + auto buff = serializer.serialize(file_name, size); file = FB::GetFile(buff); } |