diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-07-22 21:18:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-22 21:18:41 -0400 |
| commit | 31b14fdb6f2f018a9d67c9303aac9903b4227dbd (patch) | |
| tree | b44e75dc5b0fff27ad008fbea11d7bdcc994bd12 /src/machine | |
| parent | c907cba919a1e9840859296f192f3a55345ff29c (diff) | |
| parent | 487ddeb8bc1a05816802adb2d5a9dc4416b386fe (diff) | |
Merge pull request #3777 from poettering/id128-rework
uuid/id128 code rework
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machine.c | 2 | ||||
| -rw-r--r-- | src/machine/machinectl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c index c1fae57084..dd046d6563 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -181,7 +181,7 @@ int machine_save(Machine *m) { fprintf(f, "ROOT=%s\n", escaped); } - if (!sd_id128_equal(m->id, SD_ID128_NULL)) + if (!sd_id128_is_null(m->id)) fprintf(f, "ID=" SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(m->id)); if (m->leader != 0) diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 96e0ab4b8a..ddec6cb4d6 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -528,7 +528,7 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) { fputs(strna(i->name), stdout); - if (!sd_id128_equal(i->id, SD_ID128_NULL)) + if (!sd_id128_is_null(i->id)) printf("(" SD_ID128_FORMAT_STR ")\n", SD_ID128_FORMAT_VAL(i->id)); else putchar('\n'); |