From 22d7238b368075bd94d2a484b4851ecfaee30764 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 19 Oct 2010 11:25:24 +0200 Subject: [PATCH] moving src/notify to src/ --- Makefile | 8 ++++---- src/client/mysql.c | 4 ++-- src/client/stdout.c | 2 +- src/{notify => }/event.c | 4 ++-- src/{notify => }/event.h | 2 +- src/{notify => }/fscrawl.c | 8 ++++---- src/{notify => }/fscrawl.h | 2 +- src/{notify => }/inotify.c | 11 +++++------ src/{notify => }/notify.h | 2 +- src/{notify => }/queue.c | 2 +- src/{notify => }/queue.h | 2 +- test/Makefile | 12 ++++++------ test/t_fscrawl.c | 2 +- test/t_inotify.c | 2 +- test/t_queue.c | 2 +- 15 files changed, 32 insertions(+), 33 deletions(-) rename src/{notify => }/event.c (97%) rename src/{notify => }/event.h (95%) rename src/{notify => }/fscrawl.c (96%) rename src/{notify => }/fscrawl.h (94%) rename src/{notify => }/inotify.c (97%) rename src/{notify => }/notify.h (93%) rename src/{notify => }/queue.c (99%) rename src/{notify => }/queue.h (97%) diff --git a/Makefile b/Makefile index 2e1a819..3d24345 100644 --- a/Makefile +++ b/Makefile @@ -44,10 +44,10 @@ obj += src/common/strbuf.o obj += src/common/xalloc.o obj += src/common/die.o -obj += src/notify/inotify.o -obj += src/notify/event.o -obj += src/notify/fscrawl.o -obj += src/notify/queue.o +obj += src/inotify.o +obj += src/event.o +obj += src/fscrawl.o +obj += src/queue.o .PHONY : all clean cleaner all : $(PROGRAM) diff --git a/src/client/mysql.c b/src/client/mysql.c index 30e0a63..11f8f74 100644 --- a/src/client/mysql.c +++ b/src/client/mysql.c @@ -16,8 +16,8 @@ #include -#include "../notify/notify.h" -#include "../notify/event.h" +#include "../notify.h" +#include "../event.h" #include "../common/xalloc.h" #include "../ini/iniparser.h" #include "../common/util.h" diff --git a/src/client/stdout.c b/src/client/stdout.c index a680503..f392e54 100644 --- a/src/client/stdout.c +++ b/src/client/stdout.c @@ -12,7 +12,7 @@ #include #include #include -#include "../notify/notify.h" +#include "../notify.h" static void p_exit_time() { diff --git a/src/notify/event.c b/src/event.c similarity index 97% rename from src/notify/event.c rename to src/event.c index 88685b6..d15523f 100644 --- a/src/notify/event.c +++ b/src/event.c @@ -1,4 +1,4 @@ -/* notify/event.c - notify event implementation +/* event.c * * (C) Copyright 2010 Henrik Hautakoski * (C) Copyright 2010 Fredric Nilsson @@ -13,7 +13,7 @@ #include #include "event.h" -#include "../common/path.h" +#include "common/path.h" #define dealloc_data(ev) \ if (ev->path) \ diff --git a/src/notify/event.h b/src/event.h similarity index 95% rename from src/notify/event.h rename to src/event.h index 94489d2..c7e075a 100644 --- a/src/notify/event.h +++ b/src/event.h @@ -1,4 +1,4 @@ -/* notify/event.h - event data structure and operation's for notify API +/* event.h - event data structure and operation's for notify API * * (C) Copyright 2010 Henrik Hautakoski * (C) Copyright 2010 Fredric Nilsson diff --git a/src/notify/fscrawl.c b/src/fscrawl.c similarity index 96% rename from src/notify/fscrawl.c rename to src/fscrawl.c index 60f8617..ee2e1ef 100644 --- a/src/notify/fscrawl.c +++ b/src/fscrawl.c @@ -1,4 +1,4 @@ -/* notify/fscrawl.c - Filesystem traversal +/* fscrawl.c - Filesystem traversal * * (C) Copyright 2010 Henrik Hautakoski * @@ -13,9 +13,9 @@ #include #include -#include "../common/strbuf.h" -#include "../common/path.h" -#include "../common/debug.h" +#include "common/strbuf.h" +#include "common/path.h" +#include "common/debug.h" #include "fscrawl.h" #define MAX_DEPTH 0x20 diff --git a/src/notify/fscrawl.h b/src/fscrawl.h similarity index 94% rename from src/notify/fscrawl.h rename to src/fscrawl.h index 820ae35..fbf5262 100644 --- a/src/notify/fscrawl.h +++ b/src/fscrawl.h @@ -1,4 +1,4 @@ -/* notify/fscrawl.h - Filesystem traversal +/* fscrawl.h - Filesystem traversal * * (C) Copyright 2010 Henrik Hautakoski * diff --git a/src/notify/inotify.c b/src/inotify.c similarity index 97% rename from src/notify/inotify.c rename to src/inotify.c index 4fc85f7..a1711b1 100644 --- a/src/notify/inotify.c +++ b/src/inotify.c @@ -1,4 +1,4 @@ -/* notify/inotify.c - inotify implementation +/* inotify.c - inotify implementation * * (C) Copyright 2010 Henrik Hautakoski * (C) Copyright 2010 Fredric Nilsson @@ -16,12 +16,11 @@ #include #include -#include "../common/util.h" +#include "common/util.h" /* red black tree for watch descriptors */ -#include "../common/rbtree.h" -#include "../common/debug.h" -#include "../common/path.h" - +#include "common/rbtree.h" +#include "common/debug.h" +#include "common/path.h" #include "queue.h" #include "fscrawl.h" #include "notify.h" diff --git a/src/notify/notify.h b/src/notify.h similarity index 93% rename from src/notify/notify.h rename to src/notify.h index 1c05c33..01ff40d 100644 --- a/src/notify/notify.h +++ b/src/notify.h @@ -1,4 +1,4 @@ -/* notify/notify.h - filesystem notification API +/* notify.h - filesystem notification API * * (C) Copyright 2010 Henrik Hautakoski * (C) Copyright 2010 Fredric Nilsson diff --git a/src/notify/queue.c b/src/queue.c similarity index 99% rename from src/notify/queue.c rename to src/queue.c index 553a4a3..8a09b69 100644 --- a/src/notify/queue.c +++ b/src/queue.c @@ -1,4 +1,4 @@ -/* notify/queue.c +/* queue.c * * Copyright (C) 2010 Henrik Hautakoski * diff --git a/src/notify/queue.h b/src/queue.h similarity index 97% rename from src/notify/queue.h rename to src/queue.h index de8af61..4077937 100644 --- a/src/notify/queue.h +++ b/src/queue.h @@ -1,4 +1,4 @@ -/* notify/queue.h +/* queue.h * * Copyright (C) 2010 Henrik Hautakoski * diff --git a/test/Makefile b/test/Makefile index bf599b8..a7b8d25 100644 --- a/test/Makefile +++ b/test/Makefile @@ -39,23 +39,23 @@ inotify : ../src/common/die.c \ ../src/common/strbuf.c \ ../src/common/path.c \ - ../src/notify/event.c \ - ../src/notify/fscrawl.c \ - ../src/notify/queue.c \ - ../src/notify/inotify.c \ + ../src/event.c \ + ../src/fscrawl.c \ + ../src/queue.c \ + ../src/inotify.c \ t_inotify.c -o test_inotify fscrawl : $(CC) $(CFLAGS) \ ../src/common/path.c \ - ../src/notify/fscrawl.c \ + ../src/fscrawl.c \ ../src/common/xalloc.c \ ../src/common/die.c \ ../src/common/strbuf.c \ t_fscrawl.c -o test_fscrawl queue : - $(CC) $(CFLAGS) ../src/notify/queue.c t_queue.c -o test_queue + $(CC) $(CFLAGS) ../src/queue.c t_queue.c -o test_queue clean : rm -f test_* diff --git a/test/t_fscrawl.c b/test/t_fscrawl.c index ae35ca0..ff386da 100644 --- a/test/t_fscrawl.c +++ b/test/t_fscrawl.c @@ -1,6 +1,6 @@ #include -#include "../src/notify/fscrawl.h" +#include "../src/fscrawl.h" int main(int argc, char *argv[]) { diff --git a/test/t_inotify.c b/test/t_inotify.c index 479bdc0..aaf05fc 100644 --- a/test/t_inotify.c +++ b/test/t_inotify.c @@ -1,6 +1,6 @@ #include -#include "../src/notify/notify.h" +#include "../src/notify.h" PROT_SCAN_CALLBACK(my_callback) { //printf("FROM THREAD -- path: %s; is_dir = %i\n", path, dir); diff --git a/test/t_queue.c b/test/t_queue.c index 2a94608..c5b9af3 100644 --- a/test/t_queue.c +++ b/test/t_queue.c @@ -1,7 +1,7 @@ #include #include -#include "../src/notify/queue.h" +#include "../src/queue.h" int main() {