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

diff --git a/TODO b/TODO
index 1709b5e2c925af214616d78a65842fbf415c6fa2..3586b41e3c36948799987a524619b7803986ba76 100644 (file)
--- 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 4406b55f97d625a44844518e1cbad9f83d0681de..a6efd9758cc79ea7c05ba716096fea6d21318323 100644 (file)
--- 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 72408d016606438917475cbf4c076d8b4d09acab..0e0df8597d5c745c14813df9852997b7feb0ac50 100644 (file)
--- 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 3bcddb2eb3e37ea7db852e94e40fbe04efc73820..79842e69defe505539b4242161a6b03268a96f33 100644 (file)
--- 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