From 7a34aaa7be59dccf27b5a3a9dc7193d7d43d53bc Mon Sep 17 00:00:00 2001 From: NADAL Jean-Baptiste Date: Sun, 1 Apr 2018 23:18:24 +0200 Subject: [PATCH] Update libubus-cpp. --- .../libubus-cpp/builders/cmake/CMakeLists.txt | 9 +-- .../ubus-cpp/{UBusCall.h => ubus-call.h} | 13 ++-- .../ubus-cpp/{UBusCpp.h => ubus-cpp.h} | 0 .../ubus-cpp/{UBusObject.h => ubus-object.h} | 2 +- .../ubus-cpp/{UBusTimer.h => ubus-timer.h} | 0 .../src/{UBusCall.cpp => ubus-call.cpp} | 74 +++++++++---------- .../src/{UBusObject.cpp => ubus-object.cpp} | 2 +- .../src/{UBusTimer.cpp => ubus-timer.cpp} | 2 +- 8 files changed, 50 insertions(+), 52 deletions(-) rename src/lib/libubus-cpp/include/ubus-cpp/{UBusCall.h => ubus-call.h} (82%) rename src/lib/libubus-cpp/include/ubus-cpp/{UBusCpp.h => ubus-cpp.h} (100%) rename src/lib/libubus-cpp/include/ubus-cpp/{UBusObject.h => ubus-object.h} (98%) rename src/lib/libubus-cpp/include/ubus-cpp/{UBusTimer.h => ubus-timer.h} (100%) rename src/lib/libubus-cpp/src/{UBusCall.cpp => ubus-call.cpp} (59%) rename src/lib/libubus-cpp/src/{UBusObject.cpp => ubus-object.cpp} (98%) rename src/lib/libubus-cpp/src/{UBusTimer.cpp => ubus-timer.cpp} (98%) diff --git a/src/lib/libubus-cpp/builders/cmake/CMakeLists.txt b/src/lib/libubus-cpp/builders/cmake/CMakeLists.txt index 4e2ae777..3be73b05 100644 --- a/src/lib/libubus-cpp/builders/cmake/CMakeLists.txt +++ b/src/lib/libubus-cpp/builders/cmake/CMakeLists.txt @@ -7,15 +7,14 @@ set (CMAKE_CXX_STANDARD 11) include (br) -include_directories ($ENV{SRC_DIR}/src/lib/libubus-cpp/include/) +include_directories (${workspaceRoot}/src/lib/libubus-cpp/include/) file( GLOB_RECURSE source_files - - $ENV{SRC_DIR}/src/lib/libubus-cpp/src/UBusCall.cpp - $ENV{SRC_DIR}/src/lib/libubus-cpp/src/UBusObject.cpp - $ENV{SRC_DIR}/src/lib/libubus-cpp/src/UBusTimer.cpp + ${workspaceRoot}/src/lib/libubus-cpp/src/ubus-call.cpp + ${workspaceRoot}/src/lib/libubus-cpp/src/ubus-object.cpp + ${workspaceRoot}/src/lib/libubus-cpp/src/ubus-timer.cpp ) add_library( diff --git a/src/lib/libubus-cpp/include/ubus-cpp/UBusCall.h b/src/lib/libubus-cpp/include/ubus-cpp/ubus-call.h similarity index 82% rename from src/lib/libubus-cpp/include/ubus-cpp/UBusCall.h rename to src/lib/libubus-cpp/include/ubus-cpp/ubus-call.h index 0d2658c0..150519b2 100644 --- a/src/lib/libubus-cpp/include/ubus-cpp/UBusCall.h +++ b/src/lib/libubus-cpp/include/ubus-cpp/ubus-call.h @@ -37,16 +37,15 @@ class UBusCall public: UBusCall (void); - int Exec (const std::string &aPath, const std::string &aMethod, - const std::string &aParameter, std::string &aResult); + int exec (const std::string &a_path, const std::string &a_method, + const std::string &a_parameter, std::string &a_result); - int SetTimeout (int aTimeout); - int SetResult (const std::string &aResult); + int set_timeout (int a_timeout); + int set_result (const std::string &a_result); private: - int mTimeout; - std::string mData; + int m_timeout; + std::string m_data; }; - #endif /* _UBUS_CALL_H */ diff --git a/src/lib/libubus-cpp/include/ubus-cpp/UBusCpp.h b/src/lib/libubus-cpp/include/ubus-cpp/ubus-cpp.h similarity index 100% rename from src/lib/libubus-cpp/include/ubus-cpp/UBusCpp.h rename to src/lib/libubus-cpp/include/ubus-cpp/ubus-cpp.h diff --git a/src/lib/libubus-cpp/include/ubus-cpp/UBusObject.h b/src/lib/libubus-cpp/include/ubus-cpp/ubus-object.h similarity index 98% rename from src/lib/libubus-cpp/include/ubus-cpp/UBusObject.h rename to src/lib/libubus-cpp/include/ubus-cpp/ubus-object.h index b132d59b..e4cbcaa3 100644 --- a/src/lib/libubus-cpp/include/ubus-cpp/UBusObject.h +++ b/src/lib/libubus-cpp/include/ubus-cpp/ubus-object.h @@ -28,7 +28,7 @@ /*------------------------------- INCLUDES ----------------------------------*/ -#include "ubus-cpp/UBusCpp.h" +#include "ubus-cpp/ubus-cpp.h" /*----------------------------- Dependencies --------------------------------*/ diff --git a/src/lib/libubus-cpp/include/ubus-cpp/UBusTimer.h b/src/lib/libubus-cpp/include/ubus-cpp/ubus-timer.h similarity index 100% rename from src/lib/libubus-cpp/include/ubus-cpp/UBusTimer.h rename to src/lib/libubus-cpp/include/ubus-cpp/ubus-timer.h diff --git a/src/lib/libubus-cpp/src/UBusCall.cpp b/src/lib/libubus-cpp/src/ubus-call.cpp similarity index 59% rename from src/lib/libubus-cpp/src/UBusCall.cpp rename to src/lib/libubus-cpp/src/ubus-call.cpp index d3d53f2c..392b0724 100644 --- a/src/lib/libubus-cpp/src/UBusCall.cpp +++ b/src/lib/libubus-cpp/src/ubus-call.cpp @@ -32,85 +32,85 @@ extern "C" { #include "common.h" -#include "ubus-cpp/UBusCall.h" +#include "ubus-cpp/ubus-call.h" #define kDefaultTimeoutInSecond 5 static void receive_call_result_data (struct ubus_request *aReq, int aType, struct blob_attr *aMsg); - /*! ---------------------------------------------------------------------------- * @fn UBusCall * - * @brief Constructor of the UBus Handler. + * @brief Constructor of the UBus Call Command. */ UBusCall::UBusCall (void): -mTimeout (kDefaultTimeoutInSecond) +m_timeout(kDefaultTimeoutInSecond) { } + /*! ---------------------------------------------------------------------------- - * @fn Exec + * @fn exec * * @brief execute a. */ -int UBusCall::Exec (const std::string &aPath, const std::string &aMethod, - const std::string &aParameter, std::string &aResult) +int UBusCall::exec (const std::string &a_path, const std::string &a_method, + const std::string &a_parameter, std::string &a_result) { - int theRet = 0; - uint32_t theId; + int the_ret = 0; + uint32_t the_id; - struct blob_buf theBuf = {0}; - struct ubus_context *theCtx = ubus_connect (NULL); + struct blob_buf the_buf = { 0 }; + struct ubus_context *the_ctx = ubus_connect(NULL); - if (theCtx == NULL) { + if (the_ctx == NULL) { - fprintf (stderr, "%s - Failed to create an ubus context.\n", __PRETTY_FUNCTION__); + fprintf(stderr, "%s - Failed to create an ubus context.\n", __PRETTY_FUNCTION__); return -1; } - blob_buf_init (&theBuf, 0); + blob_buf_init(&the_buf, 0); - if (!aParameter.empty()) { + if (!a_parameter.empty()) { - if (!blobmsg_add_json_from_string (&theBuf, aParameter.c_str())) { + if (!blobmsg_add_json_from_string(&the_buf, a_parameter.c_str())) { - fprintf (stderr, "%s - Failed to parse message data\n", __PRETTY_FUNCTION__); + fprintf(stderr, "%s - Failed to parse message data\n", __PRETTY_FUNCTION__); return -1; } } - theRet = ubus_lookup_id (theCtx, aPath.c_str(), &theId); - if (theRet) { + the_ret = ubus_lookup_id(the_ctx, a_path.c_str(), &the_id); + if (the_ret) { - fprintf (stderr, "%s - ubus_lookup_id error = '%d'\n", __PRETTY_FUNCTION__, theRet); - ubus_free (theCtx); - blob_buf_free (&theBuf); - return theRet; + fprintf(stderr, "%s - ubus_lookup_id error = '%d'\n", __PRETTY_FUNCTION__, the_ret); + ubus_free(the_ctx); + blob_buf_free(&the_buf); + return the_ret; } - theRet = ubus_invoke (theCtx, theId, aMethod.c_str(), theBuf.head, receive_call_result_data, this, mTimeout * 1000); + the_ret = ubus_invoke(the_ctx, the_id, a_method.c_str(), the_buf.head, receive_call_result_data, this, m_timeout * 1000); - ubus_free (theCtx); - blob_buf_free (&theBuf); + ubus_free(the_ctx); + blob_buf_free(&the_buf); - if (!mData.empty()) { + if (!m_data.empty()) { - aResult = mData; + a_result = m_data; } - return theRet; + return the_ret; } /*! ---------------------------------------------------------------------------- - * @fn SetResult + * @fn set_result * * @brief Save the Result received by UBus. */ -int UBusCall::SetResult (const std::string &aResult) +int UBusCall::set_result (const std::string &a_result) { - mData = aResult; + m_data = a_result; return 0; } @@ -123,11 +123,11 @@ int UBusCall::SetResult (const std::string &aResult) static void receive_call_result_data (struct ubus_request *aReq, int aType, struct blob_attr *aMsg) { UNUSED_PARAMETER (aType); - char *theStr; + char *the_str; UBusCall *anUBusObject = static_cast(aReq->priv); - theStr = blobmsg_format_json (aMsg, true); + the_str = blobmsg_format_json(aMsg, true); - anUBusObject->SetResult (std::string (theStr)); + anUBusObject->set_result(std::string(the_str)); - free (theStr); -} \ No newline at end of file + free(the_str); +} diff --git a/src/lib/libubus-cpp/src/UBusObject.cpp b/src/lib/libubus-cpp/src/ubus-object.cpp similarity index 98% rename from src/lib/libubus-cpp/src/UBusObject.cpp rename to src/lib/libubus-cpp/src/ubus-object.cpp index 1b236871..ffdae3bf 100644 --- a/src/lib/libubus-cpp/src/UBusObject.cpp +++ b/src/lib/libubus-cpp/src/ubus-object.cpp @@ -26,7 +26,7 @@ /*------------------------------- INCLUDES ----------------------------------*/ -#include "ubus-cpp/UBusObject.h" +#include "ubus-cpp/ubus-object.h" /*------------------------------- GLOBALS ----------------------------------*/ diff --git a/src/lib/libubus-cpp/src/UBusTimer.cpp b/src/lib/libubus-cpp/src/ubus-timer.cpp similarity index 98% rename from src/lib/libubus-cpp/src/UBusTimer.cpp rename to src/lib/libubus-cpp/src/ubus-timer.cpp index 8fdc0b3a..1c444d91 100644 --- a/src/lib/libubus-cpp/src/UBusTimer.cpp +++ b/src/lib/libubus-cpp/src/ubus-timer.cpp @@ -27,7 +27,7 @@ #include -#include "ubus-cpp/UBusTimer.h" +#include "ubus-cpp/ubus-timer.h" /*! ----------------------------------------------------------------------------