X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibudev%2Flibudev.c;h=07a24d5c3c61bdfc93a98801d50ff097f966f81c;hb=c2a623d842af3a4d67e1f4e365f6d6a47f1c6cb4;hp=a0ec39d0278a51d3288475616980b6d999c9fde0;hpb=c8f8394a9309d4390daac70b736b34d0b6734f95;p=elogind.git diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index a0ec39d02..07a24d5c3 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -221,16 +221,18 @@ _public_ struct udev *udev_ref(struct udev *udev) * Drop a reference of the udev library context. If the refcount * reaches zero, the resources of the context will be released. * + * Returns: the passed udev library context if it has still an active reference, or #NULL otherwise. **/ -_public_ void udev_unref(struct udev *udev) +_public_ struct udev *udev_unref(struct udev *udev) { if (udev == NULL) - return; + return NULL; udev->refcount--; if (udev->refcount > 0) - return; + return udev; udev_list_cleanup(&udev->properties_list); free(udev); + return NULL; } /** @@ -283,51 +285,6 @@ _public_ void udev_set_log_priority(struct udev *udev, int priority) udev_add_property(udev, "UDEV_LOG", num); } -/** - * udev_get_sys_path: - * @udev: udev library context - * - * Returns always "/sys"; deprecated, will be removed in a future version. - * - * Returns: the sys mount point - **/ -_public_ const char *udev_get_sys_path(struct udev *udev) -{ - if (udev == NULL) - return NULL; - return "/sys"; -} - -/** - * udev_get_dev_path: - * @udev: udev library context - * - * Returns always "/dev"; deprecated, will be removed in a future version. - * - * Returns: the device directory path - **/ -_public_ const char *udev_get_dev_path(struct udev *udev) -{ - if (udev == NULL) - return NULL; - return "/dev"; -} - -/** - * udev_get_run_path: - * @udev: udev library context - * - * Returns always "/run/udev"; deprecated, will be removed in a future version. - * - * Returns: the runtime directory path - **/ -_public_ const char *udev_get_run_path(struct udev *udev) -{ - if (udev == NULL) - return NULL; - return "/run/udev"; -} - struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value) { if (value == NULL) {