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

InotifyUpdate: rename struct watch_directory

Browse Source
This commit is contained in:
Max Kellermann 2013-01-30 16:36:58 +01:00
parent 6805fa2fa0
commit 47a8369d79
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/InotifyUpdate.cxx
View File

@ -47,8 +47,8 @@ enum {
#endif #endif
}; };
struct watch_directory { struct WatchDirectory {
struct watch_directory *parent; WatchDirectory *parent;
char *name; char *name;
@ -61,25 +61,25 @@ static InotifySource *inotify_source;
static InotifyQueue *inotify_queue; static InotifyQueue *inotify_queue;
static unsigned inotify_max_depth; static unsigned inotify_max_depth;
static struct watch_directory inotify_root; static WatchDirectory inotify_root;
static std::map<int, watch_directory *> inotify_directories; static std::map<int, WatchDirectory *> inotify_directories;
static void static void
tree_add_watch_directory(struct watch_directory *directory) tree_add_watch_directory(WatchDirectory *directory)
{ {
inotify_directories.insert(std::make_pair(directory->descriptor, inotify_directories.insert(std::make_pair(directory->descriptor,
directory)); directory));
} }
static void static void
tree_remove_watch_directory(struct watch_directory *directory) tree_remove_watch_directory(WatchDirectory *directory)
{ {
auto i = inotify_directories.find(directory->descriptor); auto i = inotify_directories.find(directory->descriptor);
assert(i != inotify_directories.end()); assert(i != inotify_directories.end());
inotify_directories.erase(i); inotify_directories.erase(i);
} }
static struct watch_directory * static WatchDirectory *
tree_find_watch_directory(int wd) tree_find_watch_directory(int wd)
{ {
auto i = inotify_directories.find(wd); auto i = inotify_directories.find(wd);
@ -90,7 +90,7 @@ tree_find_watch_directory(int wd)
} }
static void static void
remove_watch_directory(struct watch_directory *directory) remove_watch_directory(WatchDirectory *directory)
{ {
assert(directory != NULL); assert(directory != NULL);
@ -105,18 +105,18 @@ remove_watch_directory(struct watch_directory *directory)
tree_remove_watch_directory(directory); tree_remove_watch_directory(directory);
while (directory->children != NULL) while (directory->children != NULL)
remove_watch_directory((struct watch_directory *)directory->children->data); remove_watch_directory((WatchDirectory *)directory->children->data);
directory->parent->children = directory->parent->children =
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); g_free(directory->name);
g_slice_free(struct watch_directory, directory); g_slice_free(WatchDirectory, directory);
} }
static char * static char *
watch_directory_get_uri_fs(const struct watch_directory *directory) watch_directory_get_uri_fs(const WatchDirectory *directory)
{ {
char *parent_uri, *uri; char *parent_uri, *uri;
@ -142,7 +142,7 @@ static bool skip_path(const char *path)
} }
static void static void
recursive_watch_subdirectories(struct watch_directory *directory, recursive_watch_subdirectories(WatchDirectory *directory,
const char *path_fs, unsigned depth) const char *path_fs, unsigned depth)
{ {
GError *error = NULL; GError *error = NULL;
@ -169,7 +169,7 @@ recursive_watch_subdirectories(struct watch_directory *directory,
char *child_path_fs; char *child_path_fs;
struct stat st; struct stat st;
int ret; int ret;
struct watch_directory *child; WatchDirectory *child;
if (skip_path(ent->d_name)) if (skip_path(ent->d_name))
continue; continue;
@ -205,7 +205,7 @@ recursive_watch_subdirectories(struct watch_directory *directory,
continue; continue;
} }
child = g_slice_new(struct watch_directory); child = g_slice_new(WatchDirectory);
child->parent = directory; child->parent = directory;
child->name = g_strdup(ent->d_name); child->name = g_strdup(ent->d_name);
child->descriptor = ret; child->descriptor = ret;
@ -225,7 +225,7 @@ recursive_watch_subdirectories(struct watch_directory *directory,
G_GNUC_PURE G_GNUC_PURE
static unsigned static unsigned
watch_directory_depth(const struct watch_directory *d) watch_directory_depth(const WatchDirectory *d)
{ {
assert(d != NULL); assert(d != NULL);
@ -240,7 +240,7 @@ static void
mpd_inotify_callback(int wd, unsigned mask, mpd_inotify_callback(int wd, unsigned mask,
G_GNUC_UNUSED const char *name, G_GNUC_UNUSED void *ctx) G_GNUC_UNUSED const char *name, G_GNUC_UNUSED void *ctx)
{ {
struct watch_directory *directory; WatchDirectory *directory;
char *uri_fs; char *uri_fs;
/*g_debug("wd=%d mask=0x%x name='%s'", wd, mask, name);*/ /*g_debug("wd=%d mask=0x%x name='%s'", wd, mask, name);*/
@ -350,13 +350,13 @@ mpd_inotify_finish(void)
delete inotify_source; delete inotify_source;
for (auto i : inotify_directories) { for (auto i : inotify_directories) {
watch_directory *directory = i.second; WatchDirectory *directory = i.second;
g_free(directory->name); g_free(directory->name);
g_list_free(directory->children); g_list_free(directory->children);
if (directory != &inotify_root) if (directory != &inotify_root)
g_slice_free(struct watch_directory, directory); g_slice_free(WatchDirectory, directory);
} }
inotify_directories.clear(); inotify_directories.clear();