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

sd-id128: rename Id128FormatFlag -> Id128Flag

Browse Source 
As the flag is not only for formatting.
This commit is contained in:
Yu Watanabe
2023-04-04 11:46:18 +09:00
parent 169d91b727
commit 762b78dee9
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-id128/id128-util.c
+4 -4
View File
@@ -40,7 +40,7 @@ bool id128_is_valid(const char *s) {
return false;
}
int id128_read_fd(int fd, Id128FormatFlag f, sd_id128_t *ret) {
int id128_read_fd(int fd, Id128Flag f, sd_id128_t *ret) {
char buffer[SD_ID128_UUID_STRING_MAX + 1]; /* +1 is for trailing newline */
ssize_t l;
int r;
@@ -101,7 +101,7 @@ int id128_read_fd(int fd, Id128FormatFlag f, sd_id128_t *ret) {
return r == -EINVAL ? -EUCLEAN : r;
}
int id128_read(const char *path, Id128FormatFlag f, sd_id128_t *ret) {
int id128_read(const char *path, Id128Flag f, sd_id128_t *ret) {
_cleanup_close_ int fd = -EBADF;
assert(path);
@@ -113,7 +113,7 @@ int id128_read(const char *path, Id128FormatFlag f, sd_id128_t *ret) {
return id128_read_fd(fd, f, ret);
}
int id128_write_fd(int fd, Id128FormatFlag f, sd_id128_t id) {
int id128_write_fd(int fd, Id128Flag f, sd_id128_t id) {
char buffer[SD_ID128_UUID_STRING_MAX + 1]; /* +1 is for trailing newline */
size_t sz;
int r;
@@ -143,7 +143,7 @@ int id128_write_fd(int fd, Id128FormatFlag f, sd_id128_t id) {
return 0;
}
int id128_write(const char *path, Id128FormatFlag f, sd_id128_t id) {
int id128_write(const char *path, Id128Flag f, sd_id128_t id) {
_cleanup_close_ int fd = -EBADF;
assert(path);
src/libsystemd/sd-id128/id128-util.h
+9 -9
View File
@@ -10,19 +10,19 @@
bool id128_is_valid(const char *s) _pure_;
typedef enum Id128FormatFlag {
ID128_FORMAT_PLAIN = 1 << 0, /* formatted as 32 hex chars as-is */
ID128_FORMAT_UUID = 1 << 1, /* formatted as 36 character uuid string */
ID128_FORMAT_ANY = ID128_FORMAT_PLAIN | ID128_FORMAT_UUID,
typedef enum Id128Flag {
ID128_FORMAT_PLAIN = 1 << 0, /* formatted as 32 hex chars as-is */
ID128_FORMAT_UUID = 1 << 1, /* formatted as 36 character uuid string */
ID128_FORMAT_ANY = ID128_FORMAT_PLAIN | ID128_FORMAT_UUID,
ID128_SYNC_ON_WRITE = 1 << 2, /* Sync the file after write. Used only when writing an ID. */
} Id128FormatFlag;
} Id128Flag;
int id128_read_fd(int fd, Id128FormatFlag f, sd_id128_t *ret);
int id128_read(const char *path, Id128FormatFlag f, sd_id128_t *ret);
int id128_read_fd(int fd, Id128Flag f, sd_id128_t *ret);
int id128_read(const char *path, Id128Flag f, sd_id128_t *ret);
int id128_write_fd(int fd, Id128FormatFlag f, sd_id128_t id);
int id128_write(const char *path, Id128FormatFlag f, sd_id128_t id);
int id128_write_fd(int fd, Id128Flag f, sd_id128_t id);
int id128_write(const char *path, Id128Flag f, sd_id128_t id);
void id128_hash_func(const sd_id128_t *p, struct siphash *state);
int id128_compare_func(const sd_id128_t *a, const sd_id128_t *b) _pure_;