From 7176f06c9efea4b86f3f55e448fc80e16d43e54b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 13 Apr 2022 15:38:21 +0200 Subject: basic: split out dev_t related calls into new devno-util.[ch] No actual code changes, just splitting out of some dev_t handling related calls from stat-util.[ch], they are quite a number already, and deserve their own module now I think. Also, try to settle on the name "devnum" as the name for the concept, instead of "devno" or "dev" or "devid". "devnum" is the name exported in udev APIs, hence probably best to stick to that. (this just renames a few symbols to "devum", local variables are left untouched, to make the patch not too invasive) No actual code changes. --- src/shared/sleep-config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/shared/sleep-config.c') diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c index 8ec3d09a58..a56f2ff618 100644 --- a/src/shared/sleep-config.c +++ b/src/shared/sleep-config.c @@ -20,13 +20,13 @@ #include "btrfs-util.h" #include "conf-parser.h" #include "def.h" +#include "devnum-util.h" #include "env-util.h" #include "errno-util.h" #include "fd-util.h" #include "fileio.h" #include "log.h" #include "macro.h" -#include "parse-util.h" #include "path-util.h" #include "sleep-config.h" #include "stat-util.h" @@ -274,7 +274,7 @@ static int read_resume_files(dev_t *ret_resume, uint64_t *ret_resume_offset) { if (r < 0) return log_debug_errno(r, "Error reading /sys/power/resume: %m"); - r = parse_dev(resume_str, &resume); + r = parse_devnum(resume_str, &resume); if (r < 0) return log_debug_errno(r, "Error parsing /sys/power/resume device: %s: %m", resume_str); -- cgit v1.2.1