Remove inotify support

4 files changed, 4 insertions, 255 deletions

diff --git a/common/Makefile.am b/common/Makefile.am
index 7dac6b6a..a90df324 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,16 +1,9 @@
 
-if INOTIFY
-notify_sources = notify-inotify.c
-else
-notify_sources = notify-dummy.c
-endif
-
 noinst_LIBRARIES = libhelper.a
 
-libhelper_a_SOURCES = oui.h oui.c dbus.h dbus.c \
-	textfile.h textfile.c logging.h logging.c \
-	dbus-helper.h dbus-helper.c error.h error.c \
-	glib-helper.h glib-helper.c notify.h $(notify_sources) \
+libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c \
+	logging.h logging.c error.h error.c dbus.h dbus.c \
+	dbus-helper.h dbus-helper.c glib-helper.h glib-helper.c \
 	sdp-xml.h sdp-xml.c sdp-glib.c
 
 noinst_PROGRAMS = test_textfile
@@ -19,6 +12,6 @@ test_textfile_LDADD = libhelper.a
 
 AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@
 
-EXTRA_DIST = ppoll.h uinput.h notify-dummy.c notify-inotify.c
+EXTRA_DIST = ppoll.h uinput.h
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/common/notify-dummy.c b/common/notify-dummy.c
deleted file mode 100644
index 98fdb621..00000000
--- a/common/notify-dummy.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2006-2008  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "notify.h"
-
-void notify_init(void)
-{
-}
-
-void notify_close(void)
-{
-}
-
-void notify_add(const char *pathname, notify_func func, void *user_data)
-{
-}
-
-void notify_remove(const char *pathname)
-{
-}
diff --git a/common/notify-inotify.c b/common/notify-inotify.c
deleted file mode 100644
index a8a6b193..00000000
--- a/common/notify-inotify.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2006-2008  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/inotify.h>
-
-#ifndef IN_ONLYDIR
-#define IN_ONLYDIR 0x01000000
-#endif
-
-#include <glib.h>
-
-#include "logging.h"
-#include "notify.h"
-
-static GIOChannel *io = NULL;
-
-static int fd = -1;
-static int wd = -1;
-
-static char *name = NULL;
-
-static notify_func callback = NULL;
-
-static gboolean io_event(GIOChannel *chan, GIOCondition cond, gpointer data)
-{
-	unsigned char buf[129], *ptr = buf;
-	gsize len;
-	GIOError err;
-
-	if (cond & (G_IO_HUP | G_IO_ERR))
-		return FALSE;
-
-	memset(buf, 0, sizeof(buf));
-
-	err = g_io_channel_read(chan, (gchar *) buf, sizeof(buf) - 1, &len);
-	if (err != G_IO_ERROR_NONE) {
-		if (err == G_IO_ERROR_AGAIN)
-			return TRUE;
-		error("Reading from inotify channel failed");
-		return FALSE;
-	}
-		
-
-	while (len >= sizeof(struct inotify_event)) {
-		struct inotify_event *evt = (struct inotify_event *) ptr;
-
-		if (evt->wd == wd && callback) {
-			if (evt->mask & (IN_CREATE | IN_MOVED_TO))
-				callback(NOTIFY_CREATE, evt->name, NULL);
-
-			if (evt->mask & (IN_DELETE | IN_MOVED_FROM))
-				callback(NOTIFY_DELETE, evt->name, NULL);
-
-			if (evt->mask & IN_MODIFY)
-				callback(NOTIFY_MODIFY, evt->name, NULL);
-		}
-
-		len -= sizeof(struct inotify_event) + evt->len;
-		ptr += sizeof(struct inotify_event) + evt->len;
-	}
-
-	return TRUE;
-}
-
-void notify_init(void)
-{
-	if (fd != -1)
-		return;
-
-	fd = inotify_init();
-	if (fd < 0) {
-		error("Creation of inotify context failed");
-		return;
-	}
-
-	io = g_io_channel_unix_new(fd);
-	if (!io) {
-		error("Creation of inotify channel failed");
-		return;
-	}
-
-	g_io_add_watch(io, G_IO_IN | G_IO_ERR | G_IO_HUP, io_event, NULL);
-}
-
-void notify_close(void)
-{
-	if (fd == -1)
-		return;
-
-	if (wd != -1) {
-		inotify_rm_watch(fd, wd);
-		wd = -1;
-	}
-
-	if (io) {
-		g_io_channel_unref(io);
-		io = NULL;
-	}
-
-	close(fd);
-	fd = -1;
-
-	if (name) {
-		free(name);
-		name = NULL;
-	}
-}
-
-void notify_add(const char *pathname, notify_func func, void *user_data)
-{
-	if (fd == -1 || wd != -1)
-		return;
-
-	if (name)
-		free(name);
-
-	name = strdup(pathname);
-	if (!name)
-		return;
-
-	wd = inotify_add_watch(fd, pathname,
-		IN_ONLYDIR | IN_CREATE | IN_DELETE | IN_MODIFY | IN_MOVE);
-	if (wd < 0)
-		error("Creation of watch for %s failed", pathname);
-
-	callback = func;
-}
-
-void notify_remove(const char *pathname)
-{
-	if (fd == -1 || wd == -1)
-		return;
-
-	inotify_rm_watch(fd, wd);
-	wd = -1;
-
-	callback = NULL;
-}
diff --git a/common/notify.h b/common/notify.h
deleted file mode 100644
index 50555dc1..00000000
--- a/common/notify.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2006-2008  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-typedef void (*notify_func)(int action, const char *name, void *user_data);
-
-enum {
-	NOTIFY_CREATE,
-	NOTIFY_DELETE,
-	NOTIFY_MODIFY,
-};
-
-void notify_init(void);
-void notify_close(void);
-void notify_add(const char *pathname, notify_func func, void *user_data);
-void notify_remove(const char *pathname);