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

InotifyUpdate: use new/delete instead of GLib slices

Browse Source
This commit is contained in:
Max Kellermann 2013-01-30 16:35:56 +01:00
parent 47a8369d79
commit 4ecf09f9e6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/InotifyUpdate.cxx
View File

@ -55,6 +55,13 @@ struct WatchDirectory {
int descriptor; int descriptor;
GList *children; GList *children;
WatchDirectory() = default;
WatchDirectory(WatchDirectory *_parent, const char *_name,
int _descriptor)
:parent(_parent), name(g_strdup(_name)),
descriptor(_descriptor),
children(nullptr) {}
}; };
static InotifySource *inotify_source; static InotifySource *inotify_source;
@ -112,7 +119,7 @@ remove_watch_directory(WatchDirectory *directory)
inotify_source->Remove(directory->descriptor); inotify_source->Remove(directory->descriptor);
g_free(directory->name); g_free(directory->name);
g_slice_free(WatchDirectory, directory); delete directory;
} }
static char * static char *
@ -169,7 +176,6 @@ recursive_watch_subdirectories(WatchDirectory *directory,
char *child_path_fs; char *child_path_fs;
struct stat st; struct stat st;
int ret; int ret;
WatchDirectory *child;
if (skip_path(ent->d_name)) if (skip_path(ent->d_name))
continue; continue;
@ -198,18 +204,14 @@ recursive_watch_subdirectories(WatchDirectory *directory,
continue; continue;
} }
child = tree_find_watch_directory(ret); WatchDirectory *child = tree_find_watch_directory(ret);
if (child != NULL) { if (child != NULL) {
/* already being watched */ /* already being watched */
g_free(child_path_fs); g_free(child_path_fs);
continue; continue;
} }
child = g_slice_new(WatchDirectory); child = new WatchDirectory(directory, ent->d_name, ret);
child->parent = directory;
child->name = g_strdup(ent->d_name);
child->descriptor = ret;
child->children = NULL;
directory->children = g_list_prepend(directory->children, directory->children = g_list_prepend(directory->children,
child); child);
@ -356,7 +358,7 @@ mpd_inotify_finish(void)
g_list_free(directory->children); g_list_free(directory->children);
if (directory != &inotify_root) if (directory != &inotify_root)
g_slice_free(WatchDirectory, directory); delete directory;
} }
inotify_directories.clear(); inotify_directories.clear();