From: Zbigniew Jędrzejewski-Szmek Date: Tue, 9 Jan 2024 09:37:27 +0000 (+0100) Subject: src/basic: rename uid-alloc-range.[ch] to uid-classification.[ch] X-Git-Tag: v256-rc1~1222^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e1ac16bc6a18e47b3fa09a9bb1290fa7a99b85d;p=thirdparty%2Fsystemd.git src/basic: rename uid-alloc-range.[ch] to uid-classification.[ch] We had both uid-range.h and uid-alloc-range.h. The latter now contains helpers like {uid,gid}_is_{system,dynamic,container}(), uid_for_system_journal(), so the existing name is outdated. I think the uid-range.[ch] should stay separate because it has a bunch of helpers for parsing and printing of uid ranges. So let's rename as in $subject to better reflect the contents of the file and make the two sets of files harder to confuse. --- diff --git a/src/basic/meson.build b/src/basic/meson.build index d7450d8b445..949ca4d81f9 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -96,7 +96,7 @@ basic_sources = files( 'terminal-util.c', 'time-util.c', 'tmpfile-util.c', - 'uid-alloc-range.c', + 'uid-classification.c', 'uid-range.c', 'unit-def.c', 'unit-file.c', diff --git a/src/basic/uid-alloc-range.c b/src/basic/uid-classification.c similarity index 99% rename from src/basic/uid-alloc-range.c rename to src/basic/uid-classification.c index 669cb6d56f7..e2d2cebc6de 100644 --- a/src/basic/uid-alloc-range.c +++ b/src/basic/uid-classification.c @@ -5,7 +5,7 @@ #include "fileio.h" #include "missing_threads.h" #include "string-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-util.h" static const UGIDAllocationRange default_ugid_allocation_range = { diff --git a/src/basic/uid-alloc-range.h b/src/basic/uid-classification.h similarity index 100% rename from src/basic/uid-alloc-range.h rename to src/basic/uid-classification.h diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c index 12724c682c0..484b0e29abd 100644 --- a/src/core/dynamic-user.c +++ b/src/core/dynamic-user.c @@ -20,7 +20,7 @@ #include "stdio-util.h" #include "string-util.h" #include "strv.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-util.h" /* Takes a value generated randomly or by hashing and turns it into a UID in the right range */ diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index 2b6222b308e..cd5e5343f08 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.c @@ -51,7 +51,7 @@ #include "strv.h" #include "sync-util.h" #include "tmpfile-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-util.h" /* The maximum size up to which we process coredumps. We use 1G on 32-bit systems, and 32G on 64-bit systems */ diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 35a5d7a236b..2b080257fed 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -46,7 +46,7 @@ #include "strv.h" #include "terminal-util.h" #include "tmpfile-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-util.h" #include "vpick.h" diff --git a/src/home/homectl.c b/src/home/homectl.c index 5a2eb8f31b5..222bf36e581 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -42,7 +42,7 @@ #include "rlimit-util.h" #include "spawn-polkit-agent.h" #include "terminal-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-record.h" #include "user-record-password-quality.h" #include "user-record-show.h" diff --git a/src/home/homed-home.c b/src/home/homed-home.c index 787dc773ac9..ea86dffb528 100644 --- a/src/home/homed-home.c +++ b/src/home/homed-home.c @@ -38,7 +38,7 @@ #include "stat-util.h" #include "string-table.h" #include "strv.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-record-password-quality.h" #include "user-record-sign.h" #include "user-record-util.h" diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 476da317fe7..2469451fca4 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -56,7 +56,7 @@ #include "string-table.h" #include "string-util.h" #include "syslog-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-util.h" #include "varlink-io.systemd.Journal.h" diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c index 4d7e53af08f..5a8c8a85790 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -43,7 +43,7 @@ #include "string-util.h" #include "strv.h" #include "syslog-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC) diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 8dfbb45c3ec..c60811f72ef 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -38,7 +38,7 @@ #include "strv.h" #include "terminal-util.h" #include "tmpfile-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-util.h" #define RELEASE_USEC (20*USEC_PER_SEC) diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 2675fa7e93d..4868eb48fb9 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -33,7 +33,7 @@ #include "string-table.h" #include "strv.h" #include "tmpfile-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "unit-name.h" #include "user-util.h" diff --git a/src/shared/condition.c b/src/shared/condition.c index d3446e8a9da..7563f29c94f 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -59,7 +59,7 @@ #include "string-util.h" #include "tomoyo-util.h" #include "tpm2-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-util.h" #include "virt.h" diff --git a/src/shared/group-record.c b/src/shared/group-record.c index 4fed5c671cd..7eebd2300e4 100644 --- a/src/shared/group-record.c +++ b/src/shared/group-record.c @@ -2,7 +2,7 @@ #include "group-record.h" #include "strv.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-util.h" GroupRecord* group_record_new(void) { diff --git a/src/shared/user-record.c b/src/shared/user-record.c index 4bd547a6c61..654c4d35881 100644 --- a/src/shared/user-record.c +++ b/src/shared/user-record.c @@ -16,7 +16,7 @@ #include "rlimit-util.h" #include "string-table.h" #include "strv.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-record.h" #include "user-util.h" diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index e33b0200fd9..e7dcb865c53 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -35,7 +35,7 @@ #include "strv.h" #include "sync-util.h" #include "tmpfile-util-label.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "uid-range.h" #include "user-util.h" #include "utf8.h" diff --git a/src/test/meson.build b/src/test/meson.build index 0c3cb5af880..49b021cb8ab 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -171,7 +171,7 @@ simple_tests += files( 'test-terminal-util.c', 'test-tmpfile-util.c', 'test-udev-util.c', - 'test-uid-alloc-range.c', + 'test-uid-classification.c', 'test-uid-range.c', 'test-umask-util.c', 'test-unaligned.c', diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 66208463606..be83690ee50 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -41,7 +41,7 @@ #include "tests.h" #include "tmpfile-util.h" #include "tomoyo-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" #include "user-util.h" #include "virt.h" diff --git a/src/test/test-uid-alloc-range.c b/src/test/test-uid-classification.c similarity index 99% rename from src/test/test-uid-alloc-range.c rename to src/test/test-uid-classification.c index cd06463cefb..9c7500a00e5 100644 --- a/src/test/test-uid-alloc-range.c +++ b/src/test/test-uid-classification.c @@ -9,7 +9,7 @@ #include "fs-util.h" #include "tests.h" #include "tmpfile-util.h" -#include "uid-alloc-range.h" +#include "uid-classification.h" static void test_read_login_defs_one(const char *path) { log_info("/* %s(\"%s\") */", __func__, path ?: "");