From 9920a3e8fcab775450e603750e83f35d6b9b1d53 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Jan 2013 16:42:31 +0100 Subject: InotifyUpdate: move code to destructor --- src/InotifyUpdate.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/InotifyUpdate.cxx b/src/InotifyUpdate.cxx index 2e7adb3f..d56e0517 100644 --- a/src/InotifyUpdate.cxx +++ b/src/InotifyUpdate.cxx @@ -61,6 +61,11 @@ struct WatchDirectory { :parent(_parent), name(g_strdup(_name)), descriptor(_descriptor), children(nullptr) {} + + ~WatchDirectory() { + g_free(name); + g_list_free(children); + } }; static InotifySource *inotify_source; @@ -117,7 +122,6 @@ remove_watch_directory(WatchDirectory *directory) g_list_remove(directory->parent->children, directory); inotify_source->Remove(directory->descriptor); - g_free(directory->name); delete directory; } @@ -352,10 +356,6 @@ mpd_inotify_finish(void) for (auto i : inotify_directories) { WatchDirectory *directory = i.second; - - g_free(directory->name); - g_list_free(directory->children); - delete directory; } -- cgit v1.2.3