sd-device: never return NULL+0

[elogind.git] / src / libelogind / sd-device / sd-device.c

diff --git a/src/libelogind/sd-device/sd-device.c b/src/libelogind/sd-device/sd-device.c
index b274f710935841f027c94c45d5dcf04dc9a58373..7cea5a074658ef5a63dda89881eba859a19dd0a2 100644 (file)
--- a/src/libelogind/sd-device/sd-device.c
+++ b/src/libelogind/sd-device/sd-device.c
@@ -791,6 +791,9 @@ _public_ int sd_device_get_subsystem(sd_device *device, const char **ret) {
                 device->subsystem_set = true;
         }
 
                 device->subsystem_set = true;
         }
 

+        if (!device->subsystem)
+                return -ENOENT;
+

         *ret = device->subsystem;
 
         return 0;
         *ret = device->subsystem;
 
         return 0;


@@ -908,6 +911,9 @@ _public_ int sd_device_get_driver(sd_device *device, const char **ret) {
                         return log_debug_errno(r, "sd-device: could not set driver for %s: %m", device->devpath);
         }
 
                         return log_debug_errno(r, "sd-device: could not set driver for %s: %m", device->devpath);
         }
 

+        if (!device->driver)
+                return -ENOENT;
+

         *ret = device->driver;
 
         return 0;
         *ret = device->driver;
 
         return 0;


@@ -1002,6 +1008,8 @@ _public_ int sd_device_get_sysname(sd_device *device, const char **ret) {
                         return r;
         }
 
                         return r;
         }
 

+        assert_return(device->sysname, -ENOENT);
+

         *ret = device->sysname;
 
         return 0;
         *ret = device->sysname;
 
         return 0;