From 6085e73704a1016f792e954b583de790afe36667 Mon Sep 17 00:00:00 2001 From: Krzysztof Dynowski Date: Mon, 29 Jun 2015 16:13:12 +0200 Subject: [PATCH] Adjust to coding style rules [Feature] package includes in double quotes [Cause] n/a [Solution] replace tiangle brackets to double quotes [Verification] Build Change-Id: I7fc5815a3213566172dc8561240f463d610e48ea --- cli/command-line-interface.cpp | 2 +- client/vasum-client-impl.cpp | 9 ++++----- client/vasum-client-impl.hpp | 7 +++---- client/vasum-client.cpp | 2 +- common/lxc/zone.cpp | 3 +-- common/netlink/netlink-message.cpp | 3 +-- common/netlink/netlink.cpp | 2 +- server/netdev.cpp | 3 +-- tests/unit_tests/client/ut-client-utils.cpp | 4 ++-- tests/unit_tests/client/ut-client.cpp | 5 ++--- tests/unit_tests/ipc/ut-socket.cpp | 4 +--- tests/unit_tests/server/ut-zones-manager.cpp | 8 +++----- tests/unit_tests/socket_test_service/socket-test.cpp | 13 +++++-------- 13 files changed, 26 insertions(+), 39 deletions(-) diff --git a/cli/command-line-interface.cpp b/cli/command-line-interface.cpp index 0c28cdd..a8b7d1b 100644 --- a/cli/command-line-interface.cpp +++ b/cli/command-line-interface.cpp @@ -24,7 +24,7 @@ #include "config.hpp" #include "command-line-interface.hpp" -#include +#include "vasum-client.h" #include #include diff --git a/client/vasum-client-impl.cpp b/client/vasum-client-impl.cpp index 343fd1b..0e6e004 100644 --- a/client/vasum-client-impl.cpp +++ b/client/vasum-client-impl.cpp @@ -28,16 +28,15 @@ //vsm_get_poll_fd, vsm_enter_eventloop can't be used at the same time. //TODO: Make vsm_get_status_message thread-safe version (vsm_get_status_message_r) -#include +#include "config.hpp" #include "vasum-client-impl.hpp" #include "utils.hpp" #include "exception.hpp" #include "utils/exception.hpp" #include "logger/logger.hpp" - -#include -#include -#include +#include "host-ipc-definitions.hpp" +#include "ipc/client.hpp" +#include "api/messages.hpp" #include #include diff --git a/client/vasum-client-impl.hpp b/client/vasum-client-impl.hpp index 845cf29..c949ce2 100644 --- a/client/vasum-client-impl.hpp +++ b/client/vasum-client-impl.hpp @@ -27,10 +27,9 @@ #define VASUM_CLIENT_IMPL_HPP #include "vasum-client.h" - -#include -#include -#include +#include "ipc/epoll/thread-dispatcher.hpp" +#include "ipc/epoll/event-poll.hpp" +#include "ipc/client.hpp" #include #include diff --git a/client/vasum-client.cpp b/client/vasum-client.cpp index 4acd82a..0742cc0 100644 --- a/client/vasum-client.cpp +++ b/client/vasum-client.cpp @@ -23,7 +23,7 @@ * @brief This file contains the public API for Vasum Client */ -#include +#include "config.hpp" #include "vasum-client.h" #include "vasum-client-impl.hpp" diff --git a/common/lxc/zone.cpp b/common/lxc/zone.cpp index 845d959..65207bd 100644 --- a/common/lxc/zone.cpp +++ b/common/lxc/zone.cpp @@ -40,11 +40,10 @@ #ifdef USE_EXEC #include "utils/c-array.hpp" #endif +#include "utils/initctl.hpp" #include #include - -#include #include #include diff --git a/common/netlink/netlink-message.cpp b/common/netlink/netlink-message.cpp index c64199a..29b079a 100644 --- a/common/netlink/netlink-message.cpp +++ b/common/netlink/netlink-message.cpp @@ -26,8 +26,7 @@ #include "netlink-message.hpp" #include "netlink.hpp" #include "base-exception.hpp" - -#include +#include "logger/logger.hpp" #include #include diff --git a/common/netlink/netlink.cpp b/common/netlink/netlink.cpp index 6d7be95..b048031 100644 --- a/common/netlink/netlink.cpp +++ b/common/netlink/netlink.cpp @@ -29,8 +29,8 @@ #include "utils/make-clean.hpp" #include "utils/environment.hpp" #include "base-exception.hpp" +#include "logger/logger.hpp" -#include #include #include #include diff --git a/server/netdev.cpp b/server/netdev.cpp index b9a1389..8c53d38 100644 --- a/server/netdev.cpp +++ b/server/netdev.cpp @@ -29,8 +29,7 @@ #include "utils/exception.hpp" #include "utils.hpp" #include "exception.hpp" - -#include +#include "logger/logger.hpp" #include #include diff --git a/tests/unit_tests/client/ut-client-utils.cpp b/tests/unit_tests/client/ut-client-utils.cpp index 7a1b5ac..08d43ee 100644 --- a/tests/unit_tests/client/ut-client-utils.cpp +++ b/tests/unit_tests/client/ut-client-utils.cpp @@ -23,9 +23,9 @@ * @brief Unit tests of the client utils */ -#include +#include "config.hpp" #include "ut.hpp" -#include +#include "utils.hpp" BOOST_AUTO_TEST_SUITE(ClientUtils) diff --git a/tests/unit_tests/client/ut-client.cpp b/tests/unit_tests/client/ut-client.cpp index 65d6e49..5e1f4d8 100644 --- a/tests/unit_tests/client/ut-client.cpp +++ b/tests/unit_tests/client/ut-client.cpp @@ -23,10 +23,9 @@ * @brief Unit tests of the client C API */ -#include +#include "config.hpp" #include "ut.hpp" -#include - +#include "vasum-client.h" #include "utils/latch.hpp" #include "utils/scoped-dir.hpp" #include "zones-manager.hpp" diff --git a/tests/unit_tests/ipc/ut-socket.cpp b/tests/unit_tests/ipc/ut-socket.cpp index c2577ee..1aacd22 100644 --- a/tests/unit_tests/ipc/ut-socket.cpp +++ b/tests/unit_tests/ipc/ut-socket.cpp @@ -24,10 +24,8 @@ #include "config.hpp" #include "ut.hpp" - #include "ipc/internals/socket.hpp" - -#include +#include "socket-test.hpp" using namespace ipc; diff --git a/tests/unit_tests/server/ut-zones-manager.cpp b/tests/unit_tests/server/ut-zones-manager.cpp index 125d857..1fb3316 100644 --- a/tests/unit_tests/server/ut-zones-manager.cpp +++ b/tests/unit_tests/server/ut-zones-manager.cpp @@ -25,7 +25,6 @@ #include "config.hpp" #include "ut.hpp" - #include "zones-manager.hpp" #ifdef DBUS_CONNECTION // TODO: Switch to real power-manager dbus defs when they will be implemented in power-manager @@ -36,11 +35,10 @@ #include "dbus/exception.hpp" #endif //DBUS_CONNECTION #include "host-ipc-definitions.hpp" -#include -#include -#include +#include "api/messages.hpp" +#include "ipc/epoll/thread-dispatcher.hpp" +#include "ipc/client.hpp" #include "exception.hpp" - #include "utils/glib-loop.hpp" #include "config/exception.hpp" #include "utils/latch.hpp" diff --git a/tests/unit_tests/socket_test_service/socket-test.cpp b/tests/unit_tests/socket_test_service/socket-test.cpp index 1ffc09e..841cbfd 100644 --- a/tests/unit_tests/socket_test_service/socket-test.cpp +++ b/tests/unit_tests/socket_test_service/socket-test.cpp @@ -22,15 +22,12 @@ * @brief Mini-service for IPC Socket mechanism tests */ -#include +#include "config.hpp" #include "socket-test.hpp" - -#include -#include -#include - -#include -#include +#include "logger/logger.hpp" +#include "logger/backend-journal.hpp" +#include "ipc/internals/socket.hpp" +#include "ipc/exception.hpp" #include #include -- 2.7.4