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 d7450d8b445ec37d0d05459d80be2747a58fb309..949ca4d81f971a41019890a8b48140a766cc5c0c 100644 (file)
--- 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 669cb6d56f7be263dc712ab8732b068e95881c17..e2d2cebc6de271ad53049568e0cf44127b8aa9fd 100644 (file)
--- 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 12724c682c02f3d5573f537fb1393e627c2e133b..484b0e29abdce7218c8d4eead231635b74cd9bb8 100644 (file)
--- 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 2b6222b308e03de259e0d19f74582cd0445347b8..cd5e5343f083c8b50f8e3a286a83dd014617fed0 100644 (file)
--- 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 35a5d7a236b442809b2077f385ce06d4b841f671..2b080257fed7363fff77e02c8a3f12a19a17ad69 100644 (file)
--- 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 5a2eb8f31b590dc52dc71626e730776ba666cd92..222bf36e581b241937a8bfd1e902f4fb2a7827a3 100644 (file)
--- 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 787dc773ac9f9563016eb7f6e9243acd0a1a7b01..ea86dffb5289477e4926c9f1f83a5a2cecbb816a 100644 (file)
--- 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 476da317fe764e8a976b17020bd3ccda7f0e490f..2469451fca44f750b3ade2a8d81b6aa6e574f459 100644 (file)
--- 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 4d7e53af08f32b74817b8605170470886ac07272..5a8c8a85790bc5afdc03c7ba45ea2a56d0c34ed0 100644 (file)
--- 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 8dfbb45c3ec182b4b6bbf828090e363bc4736a6c..c60811f72efb0a1b8d76082e93aaf283287f7341 100644 (file)
--- 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 2675fa7e93d4818756842c7471bf53f4ee56e14e..4868eb48fb9f3dc33aa737b4a4f91facb09ee2df 100644 (file)
--- 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 d3446e8a9da00dbd21bfc2ec06abf4df5936ed3e..7563f29c94fbc737e7a254056c39bfbb570e86e8 100644 (file)
--- 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 4fed5c671cd3d9271eca65fb294c754c3689bf87..7eebd2300e4f5c0e0e84a54e00bbf02fee6763f9 100644 (file)
--- 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 4bd547a6c61681e03a4e40ae5ce4838de652476d..654c4d3588169d9f04a4a1b0f02ce4a1e59978e3 100644 (file)
--- 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 e33b0200fd91a2e65a6709b2128881078ffc128d..e7dcb865c53f0d944fe7616a6a235d289dfafa6b 100644 (file)
--- 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 0c3cb5af8809c6f3766e0a37e6d749e67eddc012..49b021cb8abac5dd2cdc746c9254b07b02cb61ca 100644 (file)
--- 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 66208463606c8a04b1c1ad2a1350e2bffe307abd..be83690ee506a4282a2396848dfa7dcb58d03f28 100644 (file)
--- 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 cd06463cefbbb26c9b4ebee76a714a0505b6c987..9c7500a00e588cdad57d0767705e32e838262097 100644 (file)
--- 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 ?: "<custom>");