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:
+14
-14
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user