From 695d585a65b83bb39e5c57b98054c0571a572ae0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 30 Apr 2010 23:13:56 +0100 Subject: [PATCH] compile fixes for inotify --- backends/innduct.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backends/innduct.c b/backends/innduct.c index 0240e4e..6060ebd 100644 --- a/backends/innduct.c +++ b/backends/innduct.c @@ -2010,7 +2010,7 @@ static void filemon_method_startfile(InputFile *ipf, Filemon_Perfile *pf) { if (wd >= filemon_inotify_wdmax) { int newmax= wd+2; - filemon_inotify_wd= xrealloc(filemon_inotify_wd2ipf, + filemon_inotify_wd2ipf= xrealloc(filemon_inotify_wd2ipf, sizeof(*filemon_inotify_wd2ipf) * newmax); memset(filemon_inotify_wd2ipf + filemon_inotify_wdmax, 0, sizeof(*filemon_inotify_wd2ipf) * (newmax - filemon_inotify_wdmax)); @@ -2029,7 +2029,7 @@ static void filemon_method_startfile(InputFile *ipf, Filemon_Perfile *pf) { static void filemon_method_stopfile(InputFile *ipf, Filemon_Perfile *pf) { int wd= pf->wd; debug("filemon inotify stopfile %p wd=%d", ipf, wd); - int r= inotify_rm_watch(filemon_inotify_fd, filemon_inotify_wd); + int r= inotify_rm_watch(filemon_inotify_fd, wd); if (r) sysdie("inotify_rm_watch"); filemon_inotify_wd2ipf[wd]= 0; } @@ -2048,7 +2048,7 @@ static void *filemon_inotify_readable(oop_source *lp, int fd, die("inotify read %d bytes wanted struct of %d", r, (int)sizeof(iev)); } InputFile *ipf= filemon_inotify_wd2ipf[iev.wd]; - debug("filemon inotify readable read %p wd=%p", iev.wd, ipf); + debug("filemon inotify readable read %d wd=%p", iev.wd, ipf); filemon_callback(ipf); } return OOP_CONTINUE; @@ -2060,8 +2060,8 @@ static int filemon_method_init(void) { syswarn("filemon/inotify: inotify_init failed"); return 0; } - set nonblock; - loop->on_fd(loop, filemon_inotify_fd, OOP_READ, filemon_inotify_readable); + xsetnonblock(filemon_inotify_fd, 1); + loop->on_fd(loop, filemon_inotify_fd, OOP_READ, filemon_inotify_readable, 0); debug("filemon inotify init filemon_inotify_fd=%d", filemon_inotify_fd); return 1; -- 2.30.2