aboutsummaryrefslogtreecommitdiffstats
path: root/signal-composer-binding/signal.cpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-12-11 18:53:11 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-12-14 11:00:49 +0100
commit0524ef772bf0a06fec736d7e1bd0753a7b65bc8c (patch)
tree00d128ca2e05b0779d306dbb48d04936d72947fa /signal-composer-binding/signal.cpp
parent4146a3d1b078e2eb183eaf9cfdf97323624622bd (diff)
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 <romain.forlot@iot.bzh>
Diffstat (limited to 'signal-composer-binding/signal.cpp')
-rw-r--r--signal-composer-binding/signal.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/signal-composer-binding/signal.cpp b/signal-composer-binding/signal.cpp
index b9663ee..dcbf814 100644
--- a/signal-composer-binding/signal.cpp
+++ b/signal-composer-binding/signal.cpp
@@ -34,7 +34,7 @@ Signal::Signal()
unit_(""),
onReceived_(nullptr),
getSignalsArgs_(nullptr),
- signalCtx_(new struct signalCBT),
+ signalCtx_({nullptr, nullptr, nullptr, nullptr}),
subscribed_(false)
{}
@@ -49,7 +49,7 @@ Signal::Signal(const std::string& id, const std::string& event, std::vector<std:
unit_(unit),
onReceived_(onReceived),
getSignalsArgs_(getSignalsArgs),
- signalCtx_(new struct signalCBT),
+ signalCtx_({nullptr, nullptr, nullptr, nullptr}),
subscribed_(false)
{}
@@ -69,7 +69,7 @@ Signal::Signal(const std::string& id,
unit_(unit),
onReceived_(onReceived),
getSignalsArgs_(),
- signalCtx_(new struct signalCBT),
+ signalCtx_({nullptr, nullptr, nullptr, nullptr}),
subscribed_(false)
{}
@@ -77,7 +77,6 @@ Signal::~Signal()
{
json_object_put(onReceived_->argsJ);
json_object_put(getSignalsArgs_);
- delete(signalCtx_);
delete(onReceived_);
}
@@ -163,21 +162,21 @@ json_object* Signal::toJSON() const
/// @return a pointer to the signalCtx_ member initialized.
struct signalCBT* Signal::get_context()
{
- if(!signalCtx_->aSignal ||
- !signalCtx_->searchNsetSignalValue ||
- !signalCtx_->setSignalValue)
+ if(!signalCtx_.aSignal ||
+ !signalCtx_.searchNsetSignalValue ||
+ !signalCtx_.setSignalValue)
{
- signalCtx_->searchNsetSignalValue = searchNsetSignalValueHandle;
- signalCtx_->setSignalValue = setSignalValueHandle;
+ signalCtx_.searchNsetSignalValue = searchNsetSignalValueHandle;
+ signalCtx_.setSignalValue = setSignalValueHandle;
- signalCtx_->aSignal = (void*)this;
+ signalCtx_.aSignal = (void*)this;
- signalCtx_->pluginCtx = onReceived_ && onReceived_->type == CTL_TYPE_CB ?
+ signalCtx_.pluginCtx = onReceived_ && onReceived_->type == CTL_TYPE_CB ?
onReceived_->exec.cb.plugin->context:
nullptr;
}
- return signalCtx_;
+ return &signalCtx_;
}
/// @brief Set Signal timestamp and value property when an incoming