From 6341bd738d61819e61584413c8e24b421b3b66b2 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Thu, 1 Jul 2021 10:28:28 +0200
Subject: [PATCH] get rid of last warnigns
---
common/cpp/src/database/mongodb_client.cpp | 4 ++--
producer/event_monitor_producer/src/inotify_event.cpp | 8 +++-----
producer/event_monitor_producer/src/inotify_event.h | 3 +--
.../src/system_folder_watch_linux.cpp | 2 +-
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/common/cpp/src/database/mongodb_client.cpp b/common/cpp/src/database/mongodb_client.cpp
index 098cdcf63..d57c3a275 100644
--- a/common/cpp/src/database/mongodb_client.cpp
+++ b/common/cpp/src/database/mongodb_client.cpp
@@ -501,8 +501,8 @@ Error MongoDBClient::GetRecordFromDb(const std::string& collection, uint64_t id,
}
bson_error_t mongo_err;
- bson_t* filter;
- bson_t* opts;
+ bson_t* filter{nullptr};
+ bson_t* opts{nullptr};
mongoc_cursor_t* cursor;
const bson_t* doc;
char* str;
diff --git a/producer/event_monitor_producer/src/inotify_event.cpp b/producer/event_monitor_producer/src/inotify_event.cpp
index f28aa50f8..f0deca3de 100644
--- a/producer/event_monitor_producer/src/inotify_event.cpp
+++ b/producer/event_monitor_producer/src/inotify_event.cpp
@@ -2,14 +2,12 @@
namespace asapo {
-InotifyEvent::InotifyEvent(const struct inotify_event* inotify_event,
- const std::map<int, std::string>& watched_folders_paths):
- inotify_event_{inotify_event}, watched_folders_paths_{watched_folders_paths} {
-
+InotifyEvent::InotifyEvent(const struct inotify_event* inotify_event):
+ inotify_event_{inotify_event}{
}
uint32_t InotifyEvent::Length() const {
- return sizeof(struct inotify_event) + static_cast<uint32_t>(inotify_event_->len);
+ return static_cast<uint32_t>(sizeof(struct inotify_event)) + static_cast<uint32_t>(inotify_event_->len);
}
bool InotifyEvent::IsDirectoryEvent() const {
diff --git a/producer/event_monitor_producer/src/inotify_event.h b/producer/event_monitor_producer/src/inotify_event.h
index 9ba0d7ec1..a2cef81aa 100644
--- a/producer/event_monitor_producer/src/inotify_event.h
+++ b/producer/event_monitor_producer/src/inotify_event.h
@@ -13,7 +13,7 @@ namespace asapo {
class InotifyEvent {
public:
- InotifyEvent(const struct inotify_event* inotify_event, const std::map<int, std::string>& watched_folders_paths);
+ InotifyEvent(const struct inotify_event* inotify_event);
uint32_t Length() const ;
bool IsDirectoryEvent() const ;
bool IsNewFileInFolderEvent() const;
@@ -26,7 +26,6 @@ class InotifyEvent {
void Print() const;
private:
const struct inotify_event* inotify_event_;
- const std::map<int, std::string>& watched_folders_paths_;
};
}
diff --git a/producer/event_monitor_producer/src/system_folder_watch_linux.cpp b/producer/event_monitor_producer/src/system_folder_watch_linux.cpp
index 23f153fdf..31ce158a8 100644
--- a/producer/event_monitor_producer/src/system_folder_watch_linux.cpp
+++ b/producer/event_monitor_producer/src/system_folder_watch_linux.cpp
@@ -210,7 +210,7 @@ Error SystemFolderWatch::ProcessInotifyEvents(int bytes_in_buffer_, FilesToSend*
int nerrors = 0;
int nevents = 0;
for (char* p = buffer_.get(); p < buffer_.get() + bytes_in_buffer_; ) {
- InotifyEvent event{(struct inotify_event*) p, watched_folders_paths_};
+ InotifyEvent event{(struct inotify_event*) p};
auto err = ProcessInotifyEvent(event, events);
if (err) {
GetDefaultEventMonLogger()->Error("error processing inotify event: " + err->Explain());
--
GitLab