From 0260c4e1286c80bdb6aa9480669d5b31eafe91b5 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Tue, 11 Dec 2018 19:21:49 -0800 Subject: [PATCH 1/4] fix unused variable warning when in release --- .../sqlite/storage_test_fixture.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/rosbag2_storage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/storage_test_fixture.hpp b/rosbag2_storage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/storage_test_fixture.hpp index d375729f08..7049a76150 100644 --- a/rosbag2_storage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/storage_test_fixture.hpp +++ b/rosbag2_storage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/storage_test_fixture.hpp @@ -70,6 +70,7 @@ class StorageTestFixture : public TemporaryDirectoryFixture serialized_data->buffer, serialized_data->buffer_capacity, message); assert(written_size == message_size - 1); // terminated null character not counted + (void) written_size; return serialized_data; } From 111cb7245c80b3b9ae6028e67965c286bf0904a6 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Tue, 11 Dec 2018 19:27:38 -0800 Subject: [PATCH 2/4] update maintainer email --- ros2bag/package.xml | 2 +- rosbag2/package.xml | 2 +- rosbag2_converter_default_plugins/package.xml | 2 +- rosbag2_storage/package.xml | 2 +- rosbag2_storage_default_plugins/package.xml | 2 +- rosbag2_test_common/package.xml | 2 +- rosbag2_tests/package.xml | 2 +- rosbag2_transport/package.xml | 2 +- shared_queues_vendor/package.xml | 2 +- sqlite3_vendor/package.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ros2bag/package.xml b/ros2bag/package.xml index e48c06b4b4..e7d08cce6b 100644 --- a/ros2bag/package.xml +++ b/ros2bag/package.xml @@ -6,7 +6,7 @@ Entry point for rosbag in ROS 2 - Karsten Knese + Karsten Knese Apache License 2.0 ros2cli diff --git a/rosbag2/package.xml b/rosbag2/package.xml index 5136cda56d..f4a8b797f6 100644 --- a/rosbag2/package.xml +++ b/rosbag2/package.xml @@ -3,7 +3,7 @@ rosbag2 0.0.1 ROSBag2 client library - Karsten Knese + Karsten Knese Apache License 2.0 ament_cmake diff --git a/rosbag2_converter_default_plugins/package.xml b/rosbag2_converter_default_plugins/package.xml index 043b3ddec7..09d3ac04dd 100644 --- a/rosbag2_converter_default_plugins/package.xml +++ b/rosbag2_converter_default_plugins/package.xml @@ -3,7 +3,7 @@ rosbag2_converter_default_plugins 0.0.1 Package containing default plugins for format converters - Karsten Knese + Karsten Knese Apache License 2.0 ament_cmake diff --git a/rosbag2_storage/package.xml b/rosbag2_storage/package.xml index bd2fbd93a1..f387104214 100644 --- a/rosbag2_storage/package.xml +++ b/rosbag2_storage/package.xml @@ -3,7 +3,7 @@ rosbag2_storage 0.0.1 ROS2 independent storage format to store serialized ROS2 messages - Karsten Knese + Karsten Knese Apache License 2.0 ament_cmake diff --git a/rosbag2_storage_default_plugins/package.xml b/rosbag2_storage_default_plugins/package.xml index bf0cc78294..77d4cd85cf 100644 --- a/rosbag2_storage_default_plugins/package.xml +++ b/rosbag2_storage_default_plugins/package.xml @@ -3,7 +3,7 @@ rosbag2_storage_default_plugins 0.0.1 ROSBag2 SQLite3 storage plugin - Karsten Knese + Karsten Knese Apache License 2.0 ament_cmake diff --git a/rosbag2_test_common/package.xml b/rosbag2_test_common/package.xml index 0d856a7231..4d43f8033a 100644 --- a/rosbag2_test_common/package.xml +++ b/rosbag2_test_common/package.xml @@ -4,7 +4,7 @@ rosbag2_test_common 0.0.1 Commonly used test helper classes and fixtures for rosbag2 - Karsten Knese + Karsten Knese Apache License 2.0 ament_cmake diff --git a/rosbag2_tests/package.xml b/rosbag2_tests/package.xml index 5c8670cbe2..15851e060e 100644 --- a/rosbag2_tests/package.xml +++ b/rosbag2_tests/package.xml @@ -4,7 +4,7 @@ rosbag2_tests 0.0.1 Tests package for rosbag2 - Karsten Knese + Karsten Knese Apache License 2.0 ament_cmake diff --git a/rosbag2_transport/package.xml b/rosbag2_transport/package.xml index 1873e05273..3f61a4ace7 100644 --- a/rosbag2_transport/package.xml +++ b/rosbag2_transport/package.xml @@ -4,7 +4,7 @@ rosbag2_transport 0.0.1 Layer encapsulating ROS middleware to allow rosbag2 to be used with or without middleware - karsten + Karsten Knese Apache License 2.0 ament_cmake_ros diff --git a/shared_queues_vendor/package.xml b/shared_queues_vendor/package.xml index 52f64aeef4..7a01c131ca 100644 --- a/shared_queues_vendor/package.xml +++ b/shared_queues_vendor/package.xml @@ -4,7 +4,7 @@ shared_queues_vendor 0.0.1 Vendor package for concurrent queues from moodycamel - Karsten Knese + Karsten Knese Apache License 2.0 ament_cmake diff --git a/sqlite3_vendor/package.xml b/sqlite3_vendor/package.xml index 9f132ca839..43762b01d3 100644 --- a/sqlite3_vendor/package.xml +++ b/sqlite3_vendor/package.xml @@ -4,7 +4,7 @@ sqlite3_vendor 0.0.1 SQLite 3 vendor package - Karsten Knese + Karsten Knese Apache License 2.0 cmake From 24aeabe09f9e4113a6bd03fd90e1ed9a3fa07a28 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Tue, 11 Dec 2018 19:37:31 -0800 Subject: [PATCH 3/4] depend on sqlite3 in vendor package --- sqlite3_vendor/package.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sqlite3_vendor/package.xml b/sqlite3_vendor/package.xml index 43762b01d3..5db23e1bcf 100644 --- a/sqlite3_vendor/package.xml +++ b/sqlite3_vendor/package.xml @@ -9,6 +9,8 @@ cmake + libsqlite3-dev + cmake From ae1c0e2d1b614c109a94e4632e6dd8ebcfd57384 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 12 Dec 2018 04:00:53 +0000 Subject: [PATCH 4/4] do not ignore return values --- .../process_execution_helpers_unix.hpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/rosbag2_tests/test/rosbag2_tests/process_execution_helpers_unix.hpp b/rosbag2_tests/test/rosbag2_tests/process_execution_helpers_unix.hpp index b4044bfac3..56bd779bfc 100644 --- a/rosbag2_tests/test/rosbag2_tests/process_execution_helpers_unix.hpp +++ b/rosbag2_tests/test/rosbag2_tests/process_execution_helpers_unix.hpp @@ -31,11 +31,20 @@ using ProcessHandle = int; int execute_and_wait_until_completion(const std::string & command, const std::string & path) { char previous_dir[PATH_MAX]; - getcwd(previous_dir, PATH_MAX); + auto ret_get_cwd = getcwd(previous_dir, PATH_MAX); + if (ret_get_cwd == NULL) { + return EXIT_FAILURE; + } - chdir(path.c_str()); + auto ret_ch_dir = chdir(path.c_str()); + if (ret_ch_dir != 0) { + return EXIT_FAILURE; + } auto exitcode = std::system(command.c_str()); - chdir(previous_dir); + ret_ch_dir = chdir(previous_dir); + if (ret_ch_dir != 0) { + return EXIT_FAILURE; + } return WEXITSTATUS(exitcode); }