SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src/basic: "UidRange" → "UIDRange"

Browse Source 
We don't "uncapitalize" parts of an already-capitalized name when concatenating
words. In particular, we had UidRange in basic/uid-range.h and UGIDAllocationRange
in basic/uid-alloc-range.h, which is annoying.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2024-01-09 11:15:00 +01:00
parent d7d6195953
commit eb7d7d14fb
7 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/uid-range.c
+18 -18
View File
@@ -15,7 +15,7 @@
#include "uid-range.h"
#include "user-util.h"
UidRange *uid_range_free(UidRange *range) {
UIDRange *uid_range_free(UIDRange *range) {
if (!range)
return NULL;
@@ -23,14 +23,14 @@ UidRange *uid_range_free(UidRange *range) {
return mfree(range);
}
static bool uid_range_entry_intersect(const UidRangeEntry *a, const UidRangeEntry *b) {
static bool uid_range_entry_intersect(const UIDRangeEntry *a, const UIDRangeEntry *b) {
assert(a);
assert(b);
return a->start <= b->start + b->nr && a->start + a->nr >= b->start;
}
static int uid_range_entry_compare(const UidRangeEntry *a, const UidRangeEntry *b) {
static int uid_range_entry_compare(const UIDRangeEntry *a, const UIDRangeEntry *b) {
int r;
assert(a);
@@ -43,7 +43,7 @@ static int uid_range_entry_compare(const UidRangeEntry *a, const UidRangeEntry *
return CMP(a->nr, b->nr);
}
static void uid_range_coalesce(UidRange *range) {
static void uid_range_coalesce(UIDRange *range) {
assert(range);
if (range->n_entries <= 0)
@@ -52,10 +52,10 @@ static void uid_range_coalesce(UidRange *range) {
typesafe_qsort(range->entries, range->n_entries, uid_range_entry_compare);
for (size_t i = 0; i < range->n_entries; i++) {
UidRangeEntry *x = range->entries + i;
UIDRangeEntry *x = range->entries + i;
for (size_t j = i + 1; j < range->n_entries; j++) {
UidRangeEntry *y = range->entries + j;
UIDRangeEntry *y = range->entries + j;
uid_t begin, end;
if (!uid_range_entry_intersect(x, y))
@@ -68,7 +68,7 @@ static void uid_range_coalesce(UidRange *range) {
x->nr = end - begin;
if (range->n_entries > j + 1)
memmove(y, y + 1, sizeof(UidRangeEntry) * (range->n_entries - j - 1));
memmove(y, y + 1, sizeof(UIDRangeEntry) * (range->n_entries - j - 1));
range->n_entries--;
j--;
@@ -76,9 +76,9 @@ static void uid_range_coalesce(UidRange *range) {
}
}
int uid_range_add_internal(UidRange **range, uid_t start, uid_t nr, bool coalesce) {
_cleanup_(uid_range_freep) UidRange *range_new = NULL;
UidRange *p;
int uid_range_add_internal(UIDRange **range, uid_t start, uid_t nr, bool coalesce) {
_cleanup_(uid_range_freep) UIDRange *range_new = NULL;
UIDRange *p;
assert(range);
@@ -91,7 +91,7 @@ int uid_range_add_internal(UidRange **range, uid_t start, uid_t nr, bool coalesc
if (*range)
p = *range;
else {
range_new = new0(UidRange, 1);
range_new = new0(UIDRange, 1);
if (!range_new)
return -ENOMEM;
@@ -101,7 +101,7 @@ int uid_range_add_internal(UidRange **range, uid_t start, uid_t nr, bool coalesc
if (!GREEDY_REALLOC(p->entries, p->n_entries + 1))
return -ENOMEM;
p->entries[p->n_entries++] = (UidRangeEntry) {
p->entries[p->n_entries++] = (UIDRangeEntry) {
.start = start,
.nr = nr,
};
@@ -115,7 +115,7 @@ int uid_range_add_internal(UidRange **range, uid_t start, uid_t nr, bool coalesc
return 0;
}
int uid_range_add_str(UidRange **range, const char *s) {
int uid_range_add_str(UIDRange **range, const char *s) {
uid_t start, end;
int r;
@@ -129,7 +129,7 @@ int uid_range_add_str(UidRange **range, const char *s) {
return uid_range_add_internal(range, start, end - start + 1, /* coalesce = */ true);
}
int uid_range_next_lower(const UidRange *range, uid_t *uid) {
int uid_range_next_lower(const UIDRange *range, uid_t *uid) {
uid_t closest = UID_INVALID, candidate;
assert(range);
@@ -162,7 +162,7 @@ int uid_range_next_lower(const UidRange *range, uid_t *uid) {
return 1;
}
bool uid_range_covers(const UidRange *range, uid_t start, uid_t nr) {
bool uid_range_covers(const UIDRange *range, uid_t start, uid_t nr) {
if (nr == 0) /* empty range? always covered... */
return true;
@@ -204,8 +204,8 @@ int uid_map_read_one(FILE *f, uid_t *ret_base, uid_t *ret_shift, uid_t *ret_rang
return 0;
}
int uid_range_load_userns(UidRange **ret, const char *path) {
_cleanup_(uid_range_freep) UidRange *range = NULL;
int uid_range_load_userns(UIDRange **ret, const char *path) {
_cleanup_(uid_range_freep) UIDRange *range = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;
@@ -230,7 +230,7 @@ int uid_range_load_userns(UidRange **ret, const char *path) {
return r;
}
range = new0(UidRange, 1);
range = new0(UIDRange, 1);
if (!range)
return -ENOMEM;
src/basic/uid-range.h
+14 -14
View File
@@ -6,31 +6,31 @@
#include "macro.h"
typedef struct UidRangeEntry {
typedef struct UIDRangeEntry {
uid_t start, nr;
} UidRangeEntry;
} UIDRangeEntry;
typedef struct UidRange {
UidRangeEntry *entries;
typedef struct UIDRange {
UIDRangeEntry *entries;
size_t n_entries;
} UidRange;
} UIDRange;
UidRange *uid_range_free(UidRange *range);
DEFINE_TRIVIAL_CLEANUP_FUNC(UidRange*, uid_range_free);
UIDRange *uid_range_free(UIDRange *range);
DEFINE_TRIVIAL_CLEANUP_FUNC(UIDRange*, uid_range_free);
int uid_range_add_internal(UidRange **range, uid_t start, uid_t nr, bool coalesce);
static inline int uid_range_add(UidRange **range, uid_t start, uid_t nr) {
int uid_range_add_internal(UIDRange **range, uid_t start, uid_t nr, bool coalesce);
static inline int uid_range_add(UIDRange **range, uid_t start, uid_t nr) {
return uid_range_add_internal(range, start, nr, true);
}
int uid_range_add_str(UidRange **range, const char *s);
int uid_range_add_str(UIDRange **range, const char *s);
int uid_range_next_lower(const UidRange *range, uid_t *uid);
int uid_range_next_lower(const UIDRange *range, uid_t *uid);
bool uid_range_covers(const UidRange *range, uid_t start, uid_t nr);
static inline bool uid_range_contains(const UidRange *range, uid_t uid) {
bool uid_range_covers(const UIDRange *range, uid_t start, uid_t nr);
static inline bool uid_range_contains(const UIDRange *range, uid_t uid) {
return uid_range_covers(range, uid, 1);
}
int uid_map_read_one(FILE *f, uid_t *ret_base, uid_t *ret_shift, uid_t *ret_range);
int uid_range_load_userns(UidRange **ret, const char *path);
int uid_range_load_userns(UIDRange **ret, const char *path);