oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

InotifyUpdate: move code to destructor

Browse Source
This commit is contained in:
Max Kellermann 2013-01-30 16:42:31 +01:00
parent f7d8e6c40c
commit 9920a3e8fc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/InotifyUpdate.cxx
View File

@ -61,6 +61,11 @@ struct WatchDirectory {
:parent(_parent), name(g_strdup(_name)), :parent(_parent), name(g_strdup(_name)),
descriptor(_descriptor), descriptor(_descriptor),
children(nullptr) {} children(nullptr) {}
~WatchDirectory() {
g_free(name);
g_list_free(children);
}
}; };
static InotifySource *inotify_source; static InotifySource *inotify_source;
@ -117,7 +122,6 @@ remove_watch_directory(WatchDirectory *directory)
g_list_remove(directory->parent->children, directory); g_list_remove(directory->parent->children, directory);
inotify_source->Remove(directory->descriptor); inotify_source->Remove(directory->descriptor);
g_free(directory->name);
delete directory; delete directory;
} }
@ -352,10 +356,6 @@ mpd_inotify_finish(void)
for (auto i : inotify_directories) { for (auto i : inotify_directories) {
WatchDirectory *directory = i.second; WatchDirectory *directory = i.second;
g_free(directory->name);
g_list_free(directory->children);
delete directory; delete directory;
} }