From 9e25cca1302b5c37ff8b02df5427583ba3e46f6a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 16 Nov 2020 19:28:40 +0900 Subject: [PATCH] sd-device: make device_add_property_internal() inline --- src/libsystemd/sd-device/device-internal.h | 4 +++- src/libsystemd/sd-device/sd-device.c | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libsystemd/sd-device/device-internal.h b/src/libsystemd/sd-device/device-internal.h index 3f81cef796..da630f18fc 100644 --- a/src/libsystemd/sd-device/device-internal.h +++ b/src/libsystemd/sd-device/device-internal.h @@ -88,7 +88,9 @@ struct sd_device { int device_new_aux(sd_device **ret); int device_add_property_aux(sd_device *device, const char *key, const char *value, bool db); -int device_add_property_internal(sd_device *device, const char *key, const char *value); +static inline int device_add_property_internal(sd_device *device, const char *key, const char *value) { + return device_add_property_aux(device, key, value, false); +} int device_read_uevent_file(sd_device *device); int device_set_syspath(sd_device *device, const char *_syspath, bool verify); diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index bfa0781773..e895b7818a 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -128,10 +128,6 @@ int device_add_property_aux(sd_device *device, const char *_key, const char *_va return 0; } -int device_add_property_internal(sd_device *device, const char *key, const char *value) { - return device_add_property_aux(device, key, value, false); -} - int device_set_syspath(sd_device *device, const char *_syspath, bool verify) { _cleanup_free_ char *syspath = NULL; const char *devpath;