diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-09-27 16:25:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-27 16:25:27 +0200 |
| commit | b8fafaf4a1cffd02389d61ed92ca7acb1b8c739c (patch) | |
| tree | 86ebd6e5617bc070af89556aed247b4eb1f6a6ea /src/libsystemd | |
| parent | 629abfc23f4e8d61ec0e952182e8200656b2bbe1 (diff) | |
| parent | 9aa8fa701b79b74d118df8dbda0940f74aa8735b (diff) | |
Merge pull request #4220 from keszybz/show-and-formatting-fixes
Show and formatting fixes
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-bus/busctl.c | 3 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-creds.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c index eb042e9c81..2c3f591053 100644 --- a/src/libsystemd/sd-bus/busctl.c +++ b/src/libsystemd/sd-bus/busctl.c @@ -2003,8 +2003,7 @@ int main(int argc, char *argv[]) { goto finish; } - if (streq_ptr(argv[optind], "monitor") || - streq_ptr(argv[optind], "capture")) { + if (STRPTR_IN_SET(argv[optind], "monitor", "capture")) { r = sd_bus_set_monitor(bus, true); if (r < 0) { diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c index 82237af115..6fdcfa4128 100644 --- a/src/libsystemd/sd-bus/test-bus-creds.c +++ b/src/libsystemd/sd-bus/test-bus-creds.c @@ -27,12 +27,17 @@ int main(int argc, char *argv[]) { _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL; int r; + log_set_max_level(LOG_DEBUG); + log_parse_environment(); + log_open(); + if (cg_all_unified() == -ENOMEDIUM) { - puts("Skipping test: /sys/fs/cgroup/ not available"); + log_info("Skipping test: /sys/fs/cgroup/ not available"); return EXIT_TEST_SKIP; } r = sd_bus_creds_new_from_pid(&creds, 0, _SD_BUS_CREDS_ALL); + log_full_errno(r < 0 ? LOG_ERR : LOG_DEBUG, r, "sd_bus_creds_new_from_pid: %m"); assert_se(r >= 0); bus_creds_dump(creds, NULL, true); |