Formatting remote-processor code with clang-format

Signed-off-by: Thomas Cahuzac <[email protected]>

Author: tcahuzax

remote-processor/AnswerMessage.cpp

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 2011-2014, Intel Corporation
  * All rights reserved.
  *
@@ -34,26 +34,17 @@
 
 using std::string;
 
-CAnswerMessage::CAnswerMessage(const string& strAnswer, bool bSuccess) :
-    base(bSuccess ? MsgType::ESuccessAnswer : MsgType::EFailureAnswer),
-    _strAnswer(strAnswer)
+CAnswerMessage::CAnswerMessage(const string &strAnswer, bool bSuccess)
+    : base(bSuccess ? MsgType::ESuccessAnswer : MsgType::EFailureAnswer), _strAnswer(strAnswer)
 {
 }
 
-CAnswerMessage::CAnswerMessage()
-{
-}
+CAnswerMessage::CAnswerMessage() {}
 
 // Answer
-void CAnswerMessage::setAnswer(const string& strAnswer)
-{
-    _strAnswer = strAnswer;
-}
+void CAnswerMessage::setAnswer(const string &strAnswer) { _strAnswer = strAnswer; }
 
-const string& CAnswerMessage::getAnswer() const
-{
-    return _strAnswer;
-}
+const string &CAnswerMessage::getAnswer() const { return _strAnswer; }
 
 // Status
 bool CAnswerMessage::success() const

remote-processor/AnswerMessage.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 2011-2014, Intel Corporation
  * All rights reserved.
  *
@@ -36,14 +36,15 @@
 class REMOTE_PROCESSOR_EXPORT CAnswerMessage : public CMessage
 {
 public:
-    CAnswerMessage(const std::string& strAnswer, bool bSuccess);
+    CAnswerMessage(const std::string &strAnswer, bool bSuccess);
     CAnswerMessage();
 
     // Answer
-    const std::string& getAnswer() const;
+    const std::string &getAnswer() const;
 
     // Status
     bool success() const;
+
 private:
     // Fill data to send
     virtual void fillDataToSend();
@@ -54,9 +55,8 @@ class REMOTE_PROCESSOR_EXPORT CAnswerMessage : public CMessage
     */
     virtual size_t getDataSize() const;
     // Answer
-    void setAnswer(const std::string& strAnswer);
+    void setAnswer(const std::string &strAnswer);
 
     // Answer
     std::string _strAnswer;
 };
-

remote-processor/BackgroundRemoteProcessorServerBuilder.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 2011-2014, Intel Corporation
  * All rights reserved.
  *
@@ -35,8 +35,10 @@ class BackgroundRemoteProcessorServer final : public IRemoteProcessorServerInter
 {
 public:
     BackgroundRemoteProcessorServer(uint16_t uiPort,
-                                    std::unique_ptr<IRemoteCommandHandler> &commandHandler) :
-        _server(uiPort), mCommandHandler(std::move(commandHandler)) {}
+                                    std::unique_ptr<IRemoteCommandHandler> &commandHandler)
+        : _server(uiPort), mCommandHandler(std::move(commandHandler))
+    {
+    }
 
     ~BackgroundRemoteProcessorServer() { stop(); }
 
@@ -46,9 +48,8 @@ class BackgroundRemoteProcessorServer final : public IRemoteProcessorServerInter
             return false;
         }
         try {
-            mServerSuccess = std::async(std::launch::async,
-                                        &CRemoteProcessorServer::process, &_server,
-                                        std::ref(*mCommandHandler));
+            mServerSuccess = std::async(std::launch::async, &CRemoteProcessorServer::process,
+                                        &_server, std::ref(*mCommandHandler));
         } catch (std::exception &e) {
             error = "Could not create a remote processor thread: " + std::string(e.what());
             return false;
@@ -57,7 +58,8 @@ class BackgroundRemoteProcessorServer final : public IRemoteProcessorServerInter
         return true;
     }
 
-    bool stop() override {
+    bool stop() override
+    {
         _server.stop();
         return mServerSuccess.get();
     }
@@ -67,4 +69,3 @@ class BackgroundRemoteProcessorServer final : public IRemoteProcessorServerInter
     std::unique_ptr<IRemoteCommandHandler> mCommandHandler;
     std::future<bool> mServerSuccess;
 };
-

remote-processor/Message.cpp

@@ -35,29 +35,20 @@
 
 using std::string;
 
-CMessage::CMessage(MsgType ucMsgId) :
-    _ucMsgId(ucMsgId), _uiIndex(0)
-{
-}
+CMessage::CMessage(MsgType ucMsgId) : _ucMsgId(ucMsgId), _uiIndex(0) {}
 
-CMessage::CMessage() :
-    _ucMsgId(MsgType::EInvalid), _uiIndex(0)
-{
-}
+CMessage::CMessage() : _ucMsgId(MsgType::EInvalid), _uiIndex(0) {}
 
 // Msg Id
-CMessage::MsgType CMessage::getMsgId() const
-{
-    return _ucMsgId;
-}
+CMessage::MsgType CMessage::getMsgId() const { return _ucMsgId; }
 
 bool CMessage::isValidAccess(size_t offset, size_t size) const
 {
     return offset + size <= getMessageDataSize();
 }
 
 // Data
-void CMessage::writeData(const void* pvData, size_t size)
+void CMessage::writeData(const void *pvData, size_t size)
 {
     assert(isValidAccess(_uiIndex, size));
 
@@ -70,7 +61,7 @@ void CMessage::writeData(const void* pvData, size_t size)
     _uiIndex += size;
 }
 
-void CMessage::readData(void* pvData, size_t size)
+void CMessage::readData(void *pvData, size_t size)
 {
     assert(isValidAccess(_uiIndex, size));
 
@@ -83,7 +74,7 @@ void CMessage::readData(void* pvData, size_t size)
     _uiIndex += size;
 }
 
-void CMessage::writeString(const string& strData)
+void CMessage::writeString(const string &strData)
 {
     // Size
     uint32_t size = static_cast<uint32_t>(strData.length());
@@ -94,7 +85,7 @@ void CMessage::writeString(const string& strData)
     writeData(strData.c_str(), size);
 }
 
-void CMessage::readString(string& strData)
+void CMessage::readString(string &strData)
 {
     // Size
     uint32_t uiSize;
@@ -114,20 +105,17 @@ void CMessage::readString(string& strData)
     strData = string.data();
 }
 
-size_t CMessage::getStringSize(const string& strData) const
+size_t CMessage::getStringSize(const string &strData) const
 {
     // Return string length plus room to store its length
     return strData.length() + sizeof(uint32_t);
 }
 
 // Remaining data size
-size_t CMessage::getRemainingDataSize() const
-{
-    return getMessageDataSize() - _uiIndex;
-}
+size_t CMessage::getRemainingDataSize() const { return getMessageDataSize() - _uiIndex; }
 
 // Send/Receive
-CMessage::Result CMessage::serialize(asio::ip::tcp::socket &socket, bool bOut, string& strError)
+CMessage::Result CMessage::serialize(asio::ip::tcp::socket &socket, bool bOut, string &strError)
 {
     if (bOut) {
         asio::error_code ec;

remote-processor/Message.h

@@ -36,11 +36,9 @@
 
 #include <remote_processor_export.h>
 
-
 class REMOTE_PROCESSOR_EXPORT CMessage : private utility::NonCopyable
 {
 public:
-
     enum class MsgType : std::uint8_t
     {
         ECommandRequest,
@@ -52,7 +50,8 @@ class REMOTE_PROCESSOR_EXPORT CMessage : private utility::NonCopyable
     CMessage();
     virtual ~CMessage() = default;
 
-    enum Result {
+    enum Result
+    {
         success,
         peerDisconnected,
         error
@@ -81,32 +80,32 @@ class REMOTE_PROCESSOR_EXPORT CMessage : private utility::NonCopyable
     * @param[in] pvData pointer to the data array
     * @param[in] uiSize array size in bytes
     */
-    void writeData(const void* pvData, size_t uiSize);
+    void writeData(const void *pvData, size_t uiSize);
 
     /** Read raw data from the message
     *
     * @param[out] pvData pointer to the data array
     * @param[in] uiSize array size in bytes
     */
-    void readData(void* pvData, size_t uiSize);
+    void readData(void *pvData, size_t uiSize);
 
     /** Write string to the message
     *
     * @param[in] strData the string to write
     */
-    void writeString(const std::string& strData);
+    void writeString(const std::string &strData);
 
     /** Write string to the message
     *
     * @param[out] strData the string to read to
     */
-    void readString(std::string& strData);
+    void readString(std::string &strData);
 
     /** @return string length plus room to store its length
     *
     * @param[in] strData the string to get the size from
     */
-    size_t getStringSize(const std::string& strData) const;
+    size_t getStringSize(const std::string &strData) const;
 
     /** @return remaining data size to read or to write depending on the context
     * (request: write, answer: read)

remote-processor/RemoteCommand.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 2011-2014, Intel Corporation
  * All rights reserved.
  *
@@ -37,17 +37,17 @@ class IRemoteCommand
 {
 public:
     // Command Name
-    virtual const std::string& getCommand() const = 0;
+    virtual const std::string &getCommand() const = 0;
 
     // Arguments
-    virtual void addArgument(const std::string& strArgument) = 0;
+    virtual void addArgument(const std::string &strArgument) = 0;
     virtual size_t getArgumentCount() const = 0;
-    virtual const std::string& getArgument(size_t argument) const = 0;
+    virtual const std::string &getArgument(size_t argument) const = 0;
     /** Get all the arguments in a vector
      *
      * @returns a reference to a vector containing all the arguments.
      */
-    virtual const std::vector<std::string>& getArguments() const = 0;
+    virtual const std::vector<std::string> &getArguments() const = 0;
     virtual const std::string packArguments(size_t startArgument, size_t nbArguments) const = 0;
 
 protected:

remote-processor/RemoteCommandHandler.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 2011-2014, Intel Corporation
  * All rights reserved.
  *
@@ -36,7 +36,8 @@ class IRemoteCommandHandler
 {
 public:
     // Return true on success, fill result in any cases
-    virtual bool remoteCommandProcess(const IRemoteCommand& remoteCommand, std::string& strResult) = 0;
+    virtual bool remoteCommandProcess(const IRemoteCommand &remoteCommand,
+                                      std::string &strResult) = 0;
 
     virtual ~IRemoteCommandHandler() {}
 };