From 389954987adb22aca606a7db38d276cd0ec88787 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 26 Oct 2022 05:12:54 +0900 Subject: [PATCH] sd-device: make device_shallow_clone() static Conflict:adapt context Reference:https://github.com/systemd/systemd/commit/389954987adb22aca606a7db38d276cd0ec88787 --- src/libsystemd/sd-device/device-private.c | 2 +- src/libsystemd/sd-device/device-private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c index cfe4af0fcc..bc7a838608 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/sd-device/device-private.c @@ -664,7 +664,7 @@ int device_rename(sd_device *device, const char *name) { return device_add_property_internal(device, "INTERFACE", name); } -int device_shallow_clone(sd_device *device, sd_device **ret) { +static int device_shallow_clone(sd_device *device, sd_device **ret) { _cleanup_(sd_device_unrefp) sd_device *dest = NULL; const char *val = NULL; int r; diff --git a/src/libsystemd/sd-device/device-private.h b/src/libsystemd/sd-device/device-private.h index 6e96cc264a..a59f130aff 100644 --- a/src/libsystemd/sd-device/device-private.h +++ b/src/libsystemd/sd-device/device-private.h @@ -54,7 +54,6 @@ int device_get_properties_nulstr(sd_device *device, const char **ret_nulstr, siz int device_get_properties_strv(sd_device *device, char ***strv); int device_rename(sd_device *device, const char *name); -int device_shallow_clone(sd_device *device, sd_device **ret); int device_clone_with_db(sd_device *device, sd_device **ret); int device_new_from_synthetic_event(sd_device **new_device, const char *syspath, const char *action); -- 2.39.1