From: Kay Sievers <kay@vrfy.org>
Date: Sun, 15 Apr 2012 16:41:15 +0000 (+0200)
Subject: udev: udev_monitor_new_from_socket() - log error and remove from public header
X-Git-Tag: v183~295
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=80172751b7a678834c1a453ae28c0eb333958250;ds=sidebyside

udev: udev_monitor_new_from_socket() - log error and remove from public header
---

diff --git a/TODO b/TODO
index 1709b5e2c..3586b41e3 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 4406b55f9..a6efd9758 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 72408d016..0e0df8597 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 3bcddb2eb..79842e69d 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