src/basic: "UidRange" → "UIDRange"
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:
@@ -169,7 +169,7 @@ static const struct {
|
||||
},
|
||||
};
|
||||
|
||||
static int table_add_uid_boundaries(Table *table, const UidRange *p) {
|
||||
static int table_add_uid_boundaries(Table *table, const UIDRange *p) {
|
||||
int r;
|
||||
|
||||
assert(table);
|
||||
@@ -301,7 +301,7 @@ static int add_unavailable_uid(Table *table, uid_t start, uid_t end) {
|
||||
|
||||
static int table_add_uid_map(
|
||||
Table *table,
|
||||
const UidRange *p,
|
||||
const UIDRange *p,
|
||||
int (*add_unavailable)(Table *t, uid_t start, uid_t end)) {
|
||||
|
||||
uid_t focus = 0;
|
||||
@@ -311,7 +311,7 @@ static int table_add_uid_map(
|
||||
assert(add_unavailable);
|
||||
|
||||
for (size_t i = 0; p && i < p->n_entries; i++) {
|
||||
UidRangeEntry *x = p->entries + i;
|
||||
UIDRangeEntry *x = p->entries + i;
|
||||
|
||||
if (focus < x->start) {
|
||||
r = add_unavailable(table, focus, x->start-1);
|
||||
@@ -425,7 +425,7 @@ static int display_user(int argc, char *argv[], void *userdata) {
|
||||
}
|
||||
|
||||
if (table) {
|
||||
_cleanup_(uid_range_freep) UidRange *uid_range = NULL;
|
||||
_cleanup_(uid_range_freep) UIDRange *uid_range = NULL;
|
||||
int boundary_lines, uid_map_lines;
|
||||
|
||||
r = uid_range_load_userns(&uid_range, "/proc/self/uid_map");
|
||||
@@ -526,7 +526,7 @@ static int show_group(GroupRecord *gr, Table *table) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int table_add_gid_boundaries(Table *table, const UidRange *p) {
|
||||
static int table_add_gid_boundaries(Table *table, const UIDRange *p) {
|
||||
int r;
|
||||
|
||||
assert(table);
|
||||
@@ -728,7 +728,7 @@ static int display_group(int argc, char *argv[], void *userdata) {
|
||||
}
|
||||
|
||||
if (table) {
|
||||
_cleanup_(uid_range_freep) UidRange *gid_range = NULL;
|
||||
_cleanup_(uid_range_freep) UIDRange *gid_range = NULL;
|
||||
int boundary_lines, gid_map_lines;
|
||||
|
||||
r = uid_range_load_userns(&gid_range, "/proc/self/gid_map");
|
||||
|
||||
Reference in New Issue
Block a user