archive/archived
Archived
1
0
Fork 0
Code Activity

inotify-map: rename lookup to get_path

Browse source
This commit is contained in:
Henrik Hautakoski 2011-02-18 09:08:55 +01:00
parent 514a91b52e
commit e0302e8ac4
4 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/inotify-map.c
View file

@ -192,7 +192,7 @@ int inotify_map_get_wd(const char *path) {
return 0; return 0;
} }
char** inotify_map_lookup(int wd) { char** inotify_map_get_path(int wd) {
char **out = NULL; char **out = NULL;
struct list *list; struct list *list;
@ -215,7 +215,7 @@ char** inotify_map_lookup_by_path(const char *path) {
int wd = inotify_map_get_wd(path); int wd = inotify_map_get_wd(path);
if (wd) if (wd)
return inotify_map_lookup(wd); return inotify_map_get_path(wd);
return NULL; return NULL;
} }

2
src/inotify-map.h
View file

@ -21,7 +21,7 @@ void inotify_unmap_all();
int inotify_map_get_wd(const char *path); int inotify_map_get_wd(const char *path);
char** inotify_map_lookup(int wd); char** inotify_map_get_path(int wd);
char** inotify_map_lookup_by_path(const char *path); char** inotify_map_lookup_by_path(const char *path);

2
src/inotify.c
View file

@ -143,7 +143,7 @@ static void proc_event(inoev *iev) {
} }
/* lookup the watch descriptor in rbtree */ /* lookup the watch descriptor in rbtree */
paths = inotify_map_lookup(iev->wd); paths = inotify_map_get_path(iev->wd);
if (!paths) { if (!paths) {
logmsg(LOG_WARN, "-- IGNORING EVENT -- invalid watchdescriptor %i", iev->wd); logmsg(LOG_WARN, "-- IGNORING EVENT -- invalid watchdescriptor %i", iev->wd);

23
test/t_inotify-map.c
View file

@ -97,30 +97,16 @@ void test_inotify_map_get_wd() {
teardown(); teardown();
} }
void test_inotify_map_lookup() { void test_inotify_map_get_path() {
int i; int i;
setup(); setup();
for(i=0; i < 4; i++) for(i=0; i < 4; i++)
validate_list(i, inotify_map_lookup(wdref[i])); validate_list(i, inotify_map_get_path(wdref[i]));
assert(inotify_map_lookup(25) == NULL); assert(inotify_map_get_path(25) == NULL);
teardown();
}
void test_inotify_map_lookup_by_path() {
int i;
setup();
for(i=0; i < 4; i++)
validate_list(i, inotify_map_lookup_by_path(pathref[i]));
assert(inotify_map_lookup_by_path("do not exist") == NULL);
teardown(); teardown();
} }
@ -131,8 +117,7 @@ int main() {
test_inotify_unmap_wd(); test_inotify_unmap_wd();
test_inotify_unmap_all(); test_inotify_unmap_all();
test_inotify_map_get_wd(); test_inotify_map_get_wd();
test_inotify_map_lookup(); test_inotify_map_get_path();
test_inotify_map_lookup_by_path();
return 0; return 0;
} }