Fix: decoder_t class decodeSignal method signature

[apps/agl-service-can-low-level.git] / src / low-can-binding.cpp

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 18346fa..4e58dd4 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -16,27 +16,6 @@
  * limitations under the License.
  */
 
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <linux/can.h>
-#include <linux/can/raw.h>
-#include <fcntl.h>
-#include <systemd/sd-event.h>
-#include <errno.h>
-#include <vector>
-#include <map>
-#include <queue>
-#include <string>
-#include <functional>
-#include <memory>
-#include <thread>
-
-#include <json-c/json.h>
-#include <openxc.pb.h>
-
 #include "low-can-binding.hpp"
 
 /********************************************************************************
@@ -55,6 +34,7 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 {
        int ret;
 
+       // TODO: lock the subscribed_signals when insert/remove
        const auto& ss_i = subscribed_signals.find(sig.genericName);
        if (ss_i != subscribed_signals.end())
        {
@@ -99,15 +79,15 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 
 static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<CanSignal>& signals)
 {
-       int ret;
+       int ret = 0;
 
-       // TODO: lock the subscribed_signals when insert/remove
        for(const auto& signal_i : signals)
        {
                ret = subscribe_unsubscribe_signal(request, subscribe, signal_i);
                if(ret == 0)
                        return ret;
        }
+       return ret;
 }
 
 static int subscribe_unsubscribe_all(struct afb_req request, bool subscribe)