moving src/common to src/

Makefile

@@ -38,11 +38,11 @@ else
 	obj += src/client/mysql.o
 endif
 
-obj += src/common/rbtree.o
+obj += src/rbtree.o
-obj += src/common/path.o
+obj += src/path.o
-obj += src/common/strbuf.o
+obj += src/strbuf.o
-obj += src/common/xalloc.o
+obj += src/xalloc.o
-obj += src/common/die.o
+obj += src/die.o
 
 obj += src/inotify.o
 obj += src/event.o

src/client/mysql.c

@@ -18,10 +18,10 @@
 
 #include "../notify.h"
 #include "../event.h"
-#include "../common/xalloc.h"
+#include "../xalloc.h"
 #include "../ini/iniparser.h"
-#include "../common/util.h"
+#include "../util.h"
-#include "../common/debug.h"
+#include "../debug.h"
 
 typedef struct {
     char *host;

src/debug.h

@@ -1,4 +1,4 @@
-/* common/debug.h - debugging macros and definitions
+/* debug.h - debugging macros and definitions
  *
  *   Copyright (C) 2010  Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/die.c

@@ -1,4 +1,4 @@
-/* common/die.c - functionality for killing things in creative ways.
+/* die.c - functionality for killing things in creative ways.
  *
  *   Copyright (C) 2010   Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/event.c

@@ -13,7 +13,6 @@
 #include <string.h>
 
 #include "event.h"
-#include "common/path.h"
 
 #define dealloc_data(ev) \
 	if (ev->path) \

src/fscrawl.c

@@ -13,9 +13,9 @@
 #include <errno.h>
 #include <dirent.h>
 
-#include "common/strbuf.h"
+#include "strbuf.h"
-#include "common/path.h"
+#include "path.h"
-#include "common/debug.h"
+#include "debug.h"
 #include "fscrawl.h"
 
 #define MAX_DEPTH 0x20

src/inotify.c

@@ -16,11 +16,11 @@
 #include <sys/ioctl.h>
 #include <sys/inotify.h>
 
-#include "common/util.h"
+#include "util.h"
 /* red black tree for watch descriptors */
-#include "common/rbtree.h"
+#include "rbtree.h"
-#include "common/debug.h"
+#include "debug.h"
-#include "common/path.h"
+#include "path.h"
 #include "queue.h"
 #include "fscrawl.h"
 #include "notify.h"

src/path.c

@@ -1,4 +1,4 @@
-/* common/path.c - path handling routines
+/* path.c - path handling routines
  * 
  *   Copyright (C) 2010  Henrik Hautakoski <henrik.hautakoski@gmail.com>
  *

src/path.h

@@ -1,4 +1,4 @@
-/* common/path.h - path handling routines
+/* path.h - path handling routines
  * 
  *   Copyright (C) 2010  Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/rbtree.c

@@ -1,4 +1,4 @@
-/* common/rbtree.c - red black tree implementation
+/* rbtree.c - red black tree implementation
  * 
  *   Copyright (C) 2010  Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/rbtree.h

@@ -1,4 +1,4 @@
-/* common/rbtree.h
+/* rbtree.h
  * 
  *   Copyright (C) 2010  Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/strbuf.c

@@ -1,4 +1,4 @@
-/* common/strbuf.c
+/* strbuf.c
  *
  *   Copyright (C) 2010   Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/strbuf.h

@@ -1,4 +1,4 @@
-/* common/strbuf.h
+/* strbuf.h
  *
  *   Copyright (C) 2010   Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/util.h

@@ -1,4 +1,4 @@
-/* common/util.h
+/* util.h
  *
  *   Copyright (C) 2010   Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/xalloc.c

@@ -1,4 +1,4 @@
-/* common/xalloc.c
+/* xalloc.c
  *
  *   Copyright (C) 2010   Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/xalloc.h

@@ -1,4 +1,4 @@
-/* common/xalloc.h - stricter memory allocation.
+/* xalloc.h - stricter memory allocation.
  *
  *   Copyright (C) 2010   Henrik Hautakoski <henrik@fiktivkod.org>
  *

test/Makefile

@@ -10,35 +10,35 @@ raw_inotify :
 
 strbuf :
 	$(CC) $(CFLAGS) \
-		../src/common/strbuf.c \
+		../src/strbuf.c \
-		../src/common/xalloc.c \
+		../src/xalloc.c \
-		../src/common/die.c \
+		../src/die.c \
 	t_strbuf.c -o test_strbuf
 	
 path :
 	$(CC) $(CFLAGS) \
 		unit.c \
-		../src/common/xalloc.c \
+		../src/xalloc.c \
-		../src/common/die.c \
+		../src/die.c \
-		../src/common/strbuf.c \
+		../src/strbuf.c \
-		../src/common/path.c \
+		../src/path.c \
 	t_path.c -o test_path
 
 rbtree : 
 	$(CC) $(CFLAGS) \
 		unit.c \
-		../src/common/die.c \
+		../src/die.c \
-		../src/common/xalloc.c \
+		../src/xalloc.c \
-		../src/common/rbtree.c \
+		../src/rbtree.c \
 	t_rbtree.c -o test_rbtree
 
 inotify :
 	$(CC) -lpthread -D INOTIFY_DEBUG -D RB_DEBUG $(CFLAGS) \
-	    ../src/common/rbtree.c \
+	    ../src/rbtree.c \
-	    ../src/common/xalloc.c \
+	    ../src/xalloc.c \
-		../src/common/die.c \
+		../src/die.c \
-		../src/common/strbuf.c \
+		../src/strbuf.c \
-	    ../src/common/path.c \
+	    ../src/path.c \
 	    ../src/event.c \
 		../src/fscrawl.c \
 	    ../src/queue.c \
@@ -47,11 +47,11 @@ inotify :
 
 fscrawl :
 	$(CC) $(CFLAGS) \
-		../src/common/path.c \
+		../src/path.c \
 		../src/fscrawl.c \
-		../src/common/xalloc.c \
+		../src/xalloc.c \
-		../src/common/die.c \
+		../src/die.c \
-		../src/common/strbuf.c \
+		../src/strbuf.c \
 	t_fscrawl.c -o test_fscrawl
 
 queue :

test/t_path.c

@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "unit.h"
-#include "../src/common/path.h"
+#include "../src/path.h"
 
 void test_normalize() {
 

test/t_rbtree.c

@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "unit.h"
-#include "../src/common/rbtree.h"
+#include "../src/rbtree.h"
-#include "../src/common/debug.h"
+#include "../src/debug.h"
 
 #define MAX_VAL 500
 #define NODES   20

test/t_strbuf.c

@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <malloc.h>
-#include "../src/common/strbuf.h"
+#include "../src/strbuf.h"
 
 typedef unsigned int uint;