diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-12-08 14:30:31 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-12-12 21:57:31 +0900 |
| commit | 057bf780e9d45480fbacdd3b060dbe37b37f9693 (patch) | |
| tree | 4d610e28b18e2fd36ff68c024619398c3e68bc68 /src/test/test-id128.c | |
| parent | 28bf2de201e890193b57accbf736c7d3d82d813a (diff) | |
| download | systemd-057bf780e9d45480fbacdd3b060dbe37b37f9693.tar.gz | |
sd-id128: make id128_read() or friends return -ENOPKG when the file contents is "uninitialized"
Then, this drops ID128_PLAIN_OR_UNINIT. Also, this renames
Id128Format -> Id128FormatFlag, and make it bitfield.
Fixes #25634.
Diffstat (limited to 'src/test/test-id128.c')
| -rw-r--r-- | src/test/test-id128.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/test/test-id128.c b/src/test/test-id128.c index 4b71c5c00b..4175ac7b60 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -86,17 +86,17 @@ TEST(id128) { /* First, write as UUID */ assert_se(sd_id128_randomize(&id) >= 0); - assert_se(id128_write_fd(fd, ID128_UUID, id, false) >= 0); + assert_se(id128_write_fd(fd, ID128_FORMAT_UUID, id, false) >= 0); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_PLAIN, &id2) == -EINVAL); + assert_se(id128_read_fd(fd, ID128_FORMAT_PLAIN, &id2) == -EINVAL); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_UUID, &id2) >= 0); + assert_se(id128_read_fd(fd, ID128_FORMAT_UUID, &id2) >= 0); assert_se(sd_id128_equal(id, id2)); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_ANY, &id2) >= 0); + assert_se(id128_read_fd(fd, ID128_FORMAT_ANY, &id2) >= 0); assert_se(sd_id128_equal(id, id2)); /* Second, write as plain */ @@ -104,17 +104,17 @@ TEST(id128) { assert_se(ftruncate(fd, 0) >= 0); assert_se(sd_id128_randomize(&id) >= 0); - assert_se(id128_write_fd(fd, ID128_PLAIN, id, false) >= 0); + assert_se(id128_write_fd(fd, ID128_FORMAT_PLAIN, id, false) >= 0); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_UUID, &id2) == -EINVAL); + assert_se(id128_read_fd(fd, ID128_FORMAT_UUID, &id2) == -EINVAL); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_PLAIN, &id2) >= 0); + assert_se(id128_read_fd(fd, ID128_FORMAT_PLAIN, &id2) >= 0); assert_se(sd_id128_equal(id, id2)); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_ANY, &id2) >= 0); + assert_se(id128_read_fd(fd, ID128_FORMAT_ANY, &id2) >= 0); assert_se(sd_id128_equal(id, id2)); /* Third, write plain without trailing newline */ @@ -125,13 +125,13 @@ TEST(id128) { assert_se(write(fd, sd_id128_to_string(id, t), 32) == 32); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_UUID, &id2) == -EINVAL); + assert_se(id128_read_fd(fd, ID128_FORMAT_UUID, &id2) == -EINVAL); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_PLAIN, &id2) >= 0); + assert_se(id128_read_fd(fd, ID128_FORMAT_PLAIN, &id2) >= 0); assert_se(sd_id128_equal(id, id2)); - /* Third, write UUID without trailing newline */ + /* Fourth, write UUID without trailing newline */ assert_se(lseek(fd, 0, SEEK_SET) == 0); assert_se(ftruncate(fd, 0) >= 0); @@ -139,10 +139,10 @@ TEST(id128) { assert_se(write(fd, sd_id128_to_uuid_string(id, q), 36) == 36); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_PLAIN, &id2) == -EINVAL); + assert_se(id128_read_fd(fd, ID128_FORMAT_PLAIN, &id2) == -EINVAL); assert_se(lseek(fd, 0, SEEK_SET) == 0); - assert_se(id128_read_fd(fd, ID128_UUID, &id2) >= 0); + assert_se(id128_read_fd(fd, ID128_FORMAT_UUID, &id2) >= 0); assert_se(sd_id128_equal(id, id2)); if (sd_booted() > 0 && access("/etc/machine-id", F_OK) >= 0) { |