Suppress warnings from Dlog.cpp

Change-Id: I6c744605e5bdb00dc9b929fa639a9df0fae96e1d

diff --git a/src/UniversalSwitch.hpp b/src/UniversalSwitch.hpp
index fb51e07..da75202 100644 (file)
--- a/src/UniversalSwitch.hpp
+++ b/src/UniversalSwitch.hpp
@@ -70,7 +70,7 @@ public:
 
        std::list<ecore::Timer>::iterator getBatchModeTimer();
        void eraseBatchModeTimer(std::list<ecore::Timer>::iterator it);
-       
+
        void terminate();
 private:
        void changeMode(Mode mode);

diff --git a/src/batch/BatchRunner.cpp b/src/batch/BatchRunner.cpp
index 53b66cd..55142dd 100644 (file)
--- a/src/batch/BatchRunner.cpp
+++ b/src/batch/BatchRunner.cpp
@@ -929,7 +929,8 @@ Optional<std::thread> runBatch(const std::array<Optional<std::string>, (size_t)u
                                } catch (...) {
                                        exec->outputStream() << "unhandled exception\nevaluation failed\n";
                                }
-                       } else {
+                       } else
+                       {
                                exec->outputStream() << "timeouted\n";
                                DEBUG("timeouted, when waiting for context change");
                        }

diff --git a/src/batch/Dlog.cpp b/src/batch/Dlog.cpp
index 2c459bb..80bb4d8 100644 (file)
--- a/src/batch/Dlog.cpp
+++ b/src/batch/Dlog.cpp
@@ -31,7 +31,8 @@ void Dlog::terminate()
 {
        if (fdForClosing) {
                char c = 0;
-               (void)write(*fdForClosing, &c, 1);
+               auto written = write(*fdForClosing, &c, 1);
+               DEBUG("write function returned %d", written);
                ASSERT(thr.joinable());
                DEBUG("waiting for thread...");
                thr.join();
@@ -91,21 +92,20 @@ bool Dlog::start()
                                        }
                                        {
                                                auto h = state->lock();
-                                               Optional<size_t> lastEndOfLine = {};
                                                auto finalPos = pos + static_cast<size_t>(count);
+                                               auto first = 0;
                                                for (; pos < finalPos; ++pos) {
                                                        if (tmp[pos] == '\n') {
-                                                               auto first = lastEndOfLine ? (*lastEndOfLine + 1) : 0;
                                                                line.replace(0, line.size(), tmp.data() + first, pos - first);
                                                                ASSERT(line.size() == pos - first);
                                                                for (auto &f : h->listeners)
                                                                        f(line);
-                                                               lastEndOfLine = pos;
+                                                               first = (pos + 1);
                                                        }
                                                }
-                                               if (lastEndOfLine) {
-                                                       auto remainingSize = pos - (*lastEndOfLine + 1);
-                                                       memmove(tmp.data(), tmp.data() + *lastEndOfLine + 1, remainingSize);
+                                               if (first) {
+                                                       auto remainingSize = pos - first;
+                                                       memmove(tmp.data(), tmp.data() + first, remainingSize);
                                                        pos = remainingSize;
                                                }
                                        }