diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/basic/util.c | 4 | ||||
| -rw-r--r-- | src/boot/bootctl.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-objects.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-device/sd-device.c | 8 |
5 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 9c59061d1d..7d0f7575f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6148,6 +6148,9 @@ hwdb-update: http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl ) +.PHONY: built-sources +built-sources: $(BUILT_SOURCES) + .PHONY: git-tag git-tag: git tag -s "v$(VERSION)" -m "systemd $(VERSION)" diff --git a/src/basic/util.c b/src/basic/util.c index 999ef8fd26..dc20fa9baf 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -1375,9 +1375,9 @@ char *base64mem(const void *p, size_t l) { } int unbase64mem(const char *p, size_t l, void **mem, size_t *_len) { - _cleanup_free_ uint8_t *t = NULL; + _cleanup_free_ uint8_t *r = NULL; int a, b, c, d; - uint8_t *r, *z; + uint8_t *z; const char *x; size_t len; diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index ed69fb0cec..faab82dbb8 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -888,7 +888,7 @@ static int install_loader_config(const char *esp_path) { f = fopen("/etc/machine-id", "re"); if (!f) - return -errno; + return errno == ENOENT ? 0 : -errno; if (fgets(line, sizeof(line), f) != NULL) { char *s; diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index b3cc28ee9b..cbdf6552f9 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -1416,7 +1416,7 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) { e = strrchr(path, '/'); assert(e); - p = strndupa(path, MAX(1, path - e)); + p = strndupa(path, MAX(1, e - path)); parent = bus_node_allocate(bus, p); if (!parent) diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index b274f71093..7cea5a0746 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/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; } + if (!device->subsystem) + return -ENOENT; + *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); } + if (!device->driver) + return -ENOENT; + *ret = device->driver; return 0; @@ -1002,6 +1008,8 @@ _public_ int sd_device_get_sysname(sd_device *device, const char **ret) { return r; } + assert_return(device->sysname, -ENOENT); + *ret = device->sysname; return 0; |