Enable pedantic compiler flags and fix gnu/clang pedantic errors

Author: sizeofvoid

CMakeLists.txt

@@ -56,8 +56,8 @@ set(NOTIFYCPP_SOURCES
     source/notify_controller.cpp
     source/notify.cpp)
 
-# XXX readlink
-#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -pedantic " CACHE STRING "Set C++ Compiler Flags" FORCE)
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -pedantic "
+     CACHE STRING "Set C++ Compiler Flags" FORCE)
 
 
 # Offer the user the choice of overriding the installation directories

include/notify-cpp/event.h

@@ -110,7 +110,6 @@ struct EnableBitMaskOperators<Event> {
 
 class EventHandler {
 public:
-    EventHandler(const Event);
     EventHandler() = default;
 
     std::uint32_t convertToInotifyEvents(const Event) const;
@@ -131,7 +130,6 @@ class EventHandler {
 
 private:
     std::uint32_t convert(const Event, std::function<std::uint32_t(Event)>) const;
-    const Event _Events = Event::all;
 };
 
 std::string toString(const Event);

source/event.cpp

@@ -31,10 +31,6 @@
 #include <cassert>
 
 namespace notifycpp {
-EventHandler::EventHandler(const Event e)
-    : _Events(e)
-{
-}
 
 std::uint32_t
 EventHandler::convertToInotifyEvents(const Event event) const

source/fanotify.cpp

@@ -162,14 +162,14 @@ TFileSystemEventPtr Fanotify::getNextEvent()
 
         /* fanotify event received? */
         if (fds[FD_POLL_FANOTIFY].revents & POLLIN) {
-            char buffer[_fanotify_buffer_size];
+            std::vector<char> buffer(_fanotify_buffer_size);
             ssize_t length;
 
             /* Read from the FD. It will read all events available up to
              * the given buffer size. */
-            if ((length = read(fds[FD_POLL_FANOTIFY].fd, buffer, _fanotify_buffer_size)) > 0) {
+            if ((length = read(fds[FD_POLL_FANOTIFY].fd, buffer.data(), _fanotify_buffer_size)) > 0) {
 
-                auto metadata = reinterpret_cast<fanotify_event_metadata*>(buffer);
+                auto metadata = reinterpret_cast<fanotify_event_metadata*>(buffer.data());
 
                 while (FAN_EVENT_OK(metadata, length) && isRunning()) {
 

source/notify.cpp

@@ -86,18 +86,19 @@ bool Notify::isIgnored(const std::filesystem::path& p) const
 
 std::string Notify::getFilePath(int fd) const
 {
-    ssize_t len;
     char buffer[PATH_MAX];
 
     if (fd <= 0)
         return {};
 
-    sprintf(buffer, "/proc/self/fd/%d", fd);
-    if ((len = readlink(buffer, buffer, PATH_MAX - 1)) < 0)
+    std::string linkPath = "/proc/self/fd/" + std::to_string(fd);
+
+    ssize_t len = readlink(linkPath.c_str(), buffer, PATH_MAX - 1);
+    if (len < 0)
         return {};
 
     buffer[len] = '\0';
-    return std::string(buffer);
+    return std::string(buffer, len);
 }
 
 bool Notify::checkWatchFile(const FileSystemEvent& fse) const

test/unit/event_handler_test.cpp

@@ -30,7 +30,7 @@ TEST_CASE("EventOperatorTest")
     CHECK_EQ((Event::all & Event::close_write),  Event::close_write);
     CHECK_EQ((Event::close & Event::close_write), Event::close_write);
     CHECK_EQ((Event::all & Event::close), Event::close);
-    CHECK_EQ((Event::all & Event::access | Event::modify), Event::access | Event::modify);
+    CHECK_EQ((Event::all & (Event::access | Event::modify)), Event::access | Event::modify);
     CHECK_EQ((Event::all & Event::moved_from), Event::moved_from);
     CHECK_EQ((Event::move & Event::moved_from), Event::moved_from);
     CHECK_FALSE((Event::move & Event::open) == Event::open);

test/unit/fanotify_controller_test.cpp

@@ -148,9 +148,6 @@ TEST_CASE_FIXTURE(FilesystemEventHelper, "shouldIgnoreFile")
 
 TEST_CASE_FIXTURE(FilesystemEventHelper, "shouldUnwatchPath")
 {
-    std::promise<Notification> timeoutObserved;
-    std::chrono::milliseconds timeout(100);
-
     FanotifyController notifier = FanotifyController();
     notifier.watchFile(testFileOne_).unwatch(testFileOne_);
 
@@ -188,6 +185,8 @@ TEST_CASE_FIXTURE(FilesystemEventHelper, "shouldWatchPathRecursively")
                     case Event::open:
                         promisedOpen_.set_value(notification);
                         break;
+                    default:
+                        break;
                 }
 
             });

test/unit/inotify_controller_test.cpp

@@ -175,6 +175,8 @@ TEST_CASE_FIXTURE(FilesystemEventHelper, "shouldWatchPathRecursively")
                             case Event::open:
                                 promisedOpen_.set_value(notification);
                                 break;
+                            default:
+                                break;
                             }
 
                         });
@@ -192,9 +194,6 @@ TEST_CASE_FIXTURE(FilesystemEventHelper, "shouldWatchPathRecursively")
 
 TEST_CASE_FIXTURE(FilesystemEventHelper, "shouldUnwatchPath")
 {
-    std::promise<Notification> timeoutObserved;
-    std::chrono::milliseconds timeout(100);
-
     InotifyController notifier = InotifyController();
     notifier.watchFile(testFileOne_).unwatch(testFileOne_);