diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-01 14:40:24 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-01 14:40:24 +0200 |
| commit | f1057581fc6c3e6c01f46a6c2c193647a9dd5164 (patch) | |
| tree | 5dac831e831be22d143e4609380f61d06d8847f6 | |
| parent | 1db30aeab10ca716aae877b298289fe1765f14fb (diff) | |
| parent | c6ba5b80690f87bd81cfa58fe1a9680bbf3741b5 (diff) | |
Merge pull request #2936 from martinpitt/master
sd-dbus: Fix uint32 property reading
| -rw-r--r-- | src/shared/bus-util.c | 2 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 90b312a1a7..d9dd3c6a11 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1068,7 +1068,7 @@ static int map_basic(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_ } case SD_BUS_TYPE_UINT32: { - uint64_t u; + uint32_t u; uint32_t *p = userdata; r = sd_bus_message_read_basic(m, type, &u); diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 2afb7bad1a..3407d93c80 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -1896,13 +1896,13 @@ static void output_machines_list(struct machine_info *machine_infos, unsigned n) printf("%s%s%s ", on_state, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : " ", off_state); if (m->is_host) - printf("%-*s (host) %s%-*s%s %s%*u%s %*u\n", + printf("%-*s (host) %s%-*s%s %s%*" PRIu32 "%s %*" PRIu32 "\n", (int) (namelen - (sizeof(" (host)")-1)), strna(m->name), on_state, statelen, strna(m->state), off_state, on_failed, failedlen, m->n_failed_units, off_failed, jobslen, m->n_jobs); else - printf("%-*s %s%-*s%s %s%*u%s %*u\n", + printf("%-*s %s%-*s%s %s%*" PRIu32 "%s %*" PRIu32 "\n", namelen, strna(m->name), on_state, statelen, strna(m->state), off_state, on_failed, failedlen, m->n_failed_units, off_failed, @@ -4637,8 +4637,8 @@ static int show_system_status(sd_bus *bus) { printf(" State: %s%s%s\n", on, strna(mi.state), off); - printf(" Jobs: %u queued\n", mi.n_jobs); - printf(" Failed: %u units\n", mi.n_failed_units); + printf(" Jobs: %" PRIu32 " queued\n", mi.n_jobs); + printf(" Failed: %" PRIu32 " units\n", mi.n_failed_units); printf(" Since: %s; %s\n", format_timestamp(since2, sizeof(since2), mi.timestamp), |