summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-04-15 18:41:15 +0200
committerKay Sievers <kay@vrfy.org>2012-04-15 18:52:42 +0200
commit80172751b7a678834c1a453ae28c0eb333958250 (patch)
treea62983643a11ccd544364cf7d29006310200a221
parent378f2e074e38490103f999173bf717a5394170f8 (diff)
udev: udev_monitor_new_from_socket() - log error and remove from public header
-rw-r--r--TODO2
-rw-r--r--src/libudev/libudev-monitor.c2
-rw-r--r--src/libudev/libudev-queue.c1
-rw-r--r--src/libudev/libudev.h1
4 files changed, 3 insertions, 3 deletions
diff --git a/TODO b/TODO
index 1709b5e2c9..3586b41e3c 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,4 @@
Bugfixes:
-* fix Fedora's cups.rpm to use tmpfiles instead of /lib/udev/devices/
-
* swap units that are activated by one name but shown in the kernel under another are semi-broken
* make anaconda write timeout=0 for encrypted devices
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 4406b55f97..a6efd9758c 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -106,8 +106,10 @@ static struct udev_monitor *udev_monitor_new(struct udev *udev)
*
* Returns: #NULL
**/
+struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
_public_ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path)
{
+ err(udev, "udev_monitor_new_from_socket() does not do anything; please migrate to netlink\n");
errno = ENOSYS;
return NULL;
}
diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index 72408d0166..0e0df8597d 100644
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -461,6 +461,7 @@ _public_ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_qu
struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev_queue);
_public_ struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev_queue)
{
+ err(udev_queue->udev, "udev_queue_get_failed_list_entry() does not return anything; failed events are not recorded\n");
errno = ENOSYS;
return NULL;
}
diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
index 3bcddb2eb3..79842e69de 100644
--- a/src/libudev/libudev.h
+++ b/src/libudev/libudev.h
@@ -125,7 +125,6 @@ int udev_monitor_filter_add_match_subsystem_devtype(struct udev_monitor *udev_mo
int udev_monitor_filter_add_match_tag(struct udev_monitor *udev_monitor, const char *tag);
int udev_monitor_filter_update(struct udev_monitor *udev_monitor);
int udev_monitor_filter_remove(struct udev_monitor *udev_monitor);
-__attribute__((deprecated)) struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
/*
* udev_enumerate