summaryrefslogtreecommitdiffstats
path: root/src/low-can-binding.cpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-03 15:12:17 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-03 15:12:17 +0100
commit217690559c27646c7e412aaeacfa2064a9e7e6e4 (patch)
tree9eb275e2442a542940e4b73218916369699db626 /src/low-can-binding.cpp
parent2e8e455644720437d32b0377a7a1697d96655727 (diff)
change all genericName to generic_name. Now all
objects use the same variable name Change-Id: I8a232bc8fd7e580bd8088e6b2ae7a90666ef9c62 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/low-can-binding.cpp')
-rw-r--r--src/low-can-binding.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 420ad96..11a310b 100644
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -81,7 +81,7 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
std::map<std::string, struct afb_event>& s = get_subscribed_signals();
- if (s.find(sig.genericName) != s.end() && !afb_event_is_valid(s[std::string(sig.genericName)]))
+ if (s.find(sig.generic_name) != s.end() && !afb_event_is_valid(s[std::string(sig.generic_name)]))
{
if(!subscribe)
{
@@ -90,14 +90,14 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
}
else
/* Event it isn't valid annymore, recreate it */
- ret = create_event_handle(sig.genericName, s);
+ ret = create_event_handle(sig.generic_name, s);
}
else
{
/* Event don't exist , so let's create it */
struct afb_event empty_event = {nullptr, nullptr};
- subscribed_signals[sig.genericName] = empty_event;
- ret = create_event_handle(sig.genericName, s);
+ subscribed_signals[sig.generic_name] = empty_event;
+ ret = create_event_handle(sig.generic_name, s);
}
/* Check whether or not the event handler has been correctly created and
@@ -105,7 +105,7 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
*/
if (ret <= 0)
return ret;
- return make_subscription_unsubscription(request, sig.genericName, s, subscribe);
+ return make_subscription_unsubscription(request, sig.generic_name, s, subscribe);
}
/**
@@ -128,7 +128,7 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe,
if(ret <= 0)
return ret;
rets++;
- DEBUG(binder_interface, "Signal: %s subscribed", signal_i.genericName);
+ DEBUG(binder_interface, "Signal: %s subscribed", signal_i.generic_name);
}
return rets;
}