From: Yu Watanabe Date: Fri, 30 Oct 2020 00:52:45 +0000 (+0900) Subject: Merge pull request #17399 from afq984/udev-escaped-string X-Git-Tag: v247-rc2~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=819a555bc5cccd6b4e8b53b7b5036744a94142a7;p=thirdparty%2Fsystemd.git Merge pull request #17399 from afq984/udev-escaped-string Allow escaped string in udev rules --- 819a555bc5cccd6b4e8b53b7b5036744a94142a7 diff --cc src/shared/udev-util.h index 58803ea5226,427808c63bc..0eb7f819043 --- a/src/shared/udev-util.h +++ b/src/shared/udev-util.h @@@ -28,7 -28,9 +28,9 @@@ static inline int udev_parse_config(voi return udev_parse_config_full(NULL, NULL, NULL, NULL, NULL); } -int device_wait_for_initialization(sd_device *device, const char *subsystem, usec_t timeout, sd_device **ret); -int device_wait_for_devlink(const char *path, const char *subsystem, usec_t timeout, sd_device **ret); +int device_wait_for_initialization(sd_device *device, const char *subsystem, usec_t deadline, sd_device **ret); +int device_wait_for_devlink(const char *path, const char *subsystem, usec_t deadline, sd_device **ret); int device_is_renaming(sd_device *dev); bool device_for_action(sd_device *dev, DeviceAction action); + + int udev_rule_parse_value(char *str, char **ret_value, char **ret_endpos);