From 0524ef772bf0a06fec736d7e1bd0753a7b65bc8c Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 11 Dec 2017 18:53:11 +0100 Subject: Use value instead of pointer for a member no reason to keep it as pointer, and simpler to initiaze it at construction time. Change-Id: I0aee4483c834e66651d80998de81c99799451ff5 Signed-off-by: Romain Forlot --- signal-composer-binding/signal.hpp | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'signal-composer-binding/signal.hpp') diff --git a/signal-composer-binding/signal.hpp b/signal-composer-binding/signal.hpp index 0fbb0a6..63be5c9 100644 --- a/signal-composer-binding/signal.hpp +++ b/signal-composer-binding/signal.hpp @@ -53,6 +53,19 @@ struct signalValue { hasBool(false), boolVal(false), hasNum(false), numVal(0), hasStr(true), strVal(s) {}; }; +extern "C" void searchNsetSignalValueHandle(const char* aName, uint64_t timestamp, struct signalValue value); +extern "C" void setSignalValueHandle(void* aSignal, uint64_t timestamp, struct signalValue value); + +/// @brief Holds composer callbacks and obj to manipulate +struct signalCBT +{ + void (*searchNsetSignalValue)(const char* aName, uint64_t timestamp, struct signalValue value); + void (*setSignalValue)(void* aSignal, uint64_t timestamp, struct signalValue value); + void* aSignal; + void* pluginCtx; +}; + + /// @brief Holds a signal (raw or virtual) definition. Value could be of /// different types, so an intermediate structure is use to store them. /// A signal could also be a subject or an observer at the same time, this @@ -73,7 +86,7 @@ private: std::string unit_; CtlActionT* onReceived_; json_object* getSignalsArgs_; - struct signalCBT* signalCtx_; + struct signalCBT signalCtx_; public: bool subscribed_; ///< subscribed_ - boolean value telling if yes or no the signal has been subcribed to the low level binding. @@ -105,15 +118,3 @@ public: int initialRecursionCheck(); int recursionCheck(Signal* obs); }; - -extern "C" void searchNsetSignalValueHandle(const char* aName, uint64_t timestamp, struct signalValue value); -extern "C" void setSignalValueHandle(void* aSignal, uint64_t timestamp, struct signalValue value); - -/// @brief Holds composer callbacks and obj to manipulate -struct signalCBT -{ - void (*searchNsetSignalValue)(const char* aName, uint64_t timestamp, struct signalValue value); - void (*setSignalValue)(void* aSignal, uint64_t timestamp, struct signalValue value); - void* aSignal; - void* pluginCtx; -}; -- cgit 1.2.3-korg