libudev: accept NULL as the argument 'struct udev*' for udev_monitor_new() or friends

As udev_monitor struct or friends are now almost independent of udev
struct. So, generating these objects without udev struct is reasonable.

diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 0f132c54b572b2267e9c128c73b0c10e6fb61f3d..e6d6f70510016c92b45b037df1e40613c6d42267 100644 (file)
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -196,8 +196,6 @@ _public_ const char *udev_device_get_property_value(struct udev_device *udev_dev
 struct udev_device *udev_device_new(struct udev *udev) {
         struct udev_device *udev_device;
 
-        assert_return_errno(udev, NULL, EINVAL);
-
         udev_device = new0(struct udev_device, 1);
         if (!udev_device) {
                 errno = ENOMEM;

diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index c9d54dc72c18c65628a20aaf93f4f3a15600931d..e9f0f2e47ec4609cd29e020dda6b6534aee53a6c 100644 (file)
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
@@ -52,8 +52,6 @@ _public_ struct udev_enumerate *udev_enumerate_new(struct udev *udev) {
         _cleanup_free_ struct udev_enumerate *udev_enumerate = NULL;
         int r;
 
-        assert_return_errno(udev, NULL, EINVAL);
-
         udev_enumerate = new0(struct udev_enumerate, 1);
         if (!udev_enumerate) {
                 errno = ENOMEM;

diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
index 45322677e999a7c7ed9a6492ed97099b2a6ded6b..d13cc4dfb57dfeca00b23105d6a5d80fd935b8d4 100644 (file)
--- a/src/libudev/libudev-hwdb.c
+++ b/src/libudev/libudev-hwdb.c
@@ -40,8 +40,6 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev *udev) {
         struct udev_hwdb *hwdb;
         int r;
 
-        assert_return_errno(udev, NULL, EINVAL);
-
         r = sd_hwdb_new(&hwdb_internal);
         if (r < 0) {
                 errno = -r;

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index bfad50c891c6d740bea2509843ee274462ce5604..85ff7aaf56776e10f016627e21f1b5463857e27a 100644 (file)
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -153,11 +153,6 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
         struct udev_monitor *udev_monitor;
         unsigned int group;
 
-        if (udev == NULL) {
-                errno = EINVAL;
-                return NULL;
-        }
-
         if (name == NULL)
                 group = UDEV_MONITOR_NONE;
         else if (streq(name, "udev")) {

diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index 14e8a67e0840b88a8f1d8b93c5f8e7ee6b235dfd..c45abfd520a31dc7a414eea4e7b18c224fc61dbd 100644 (file)
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -45,11 +45,6 @@ _public_ struct udev_queue *udev_queue_new(struct udev *udev)
 {
         struct udev_queue *udev_queue;
 
-        if (udev == NULL) {
-                errno = EINVAL;
-                return NULL;
-        }
-
         udev_queue = new0(struct udev_queue, 1);
         if (udev_queue == NULL) {
                 errno = ENOMEM;

diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 16a0eed841f629ce80a65b67a00884dd93534be3..b09480ead79c11c03e915ba6ade74647ca82edf5 100644 (file)
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -42,7 +42,6 @@ int udev_device_new_from_stat_rdev(struct udev *udev, const struct stat *st, str
         struct udev_device *nd;
         char type;
 
-        assert(udev);
         assert(st);
         assert(ret);
 

diff --git a/src/udev/udevadm-util.c b/src/udev/udevadm-util.c
index 0e8a820a56b21130d670321f6c922d428ef2dbc9..ff5e5d76753faf5463b3b17d7017197707098920 100644 (file)
--- a/src/udev/udevadm-util.c
+++ b/src/udev/udevadm-util.c
@@ -8,7 +8,6 @@ struct udev_device *find_device(struct udev *udev,
                                 const char *id,
                                 const char *prefix) {
 
-        assert(udev);
         assert(id);
 
         if (prefix && !startswith(id, prefix))