chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: introduce our own gperf based capability list
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-dump.c
diff --git
a/src/libsystemd/sd-bus/bus-dump.c
b/src/libsystemd/sd-bus/bus-dump.c
index 54716bd9042202e6e623ad11cbcd3f0dc5b3951f..33d0ed2df61cad4f5577a95b53f3cb1bc3e36839 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-dump.c
+++ b/
src/libsystemd/sd-bus/bus-dump.c
@@
-24,6
+24,7
@@
#include "strv.h"
#include "audit.h"
#include "macro.h"
#include "strv.h"
#include "audit.h"
#include "macro.h"
+#include "cap-list.h"
#include "bus-message.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-internal.h"
@@
-125,10
+126,8
@@
int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
}
r = sd_bus_message_rewind(m, !(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY));
}
r = sd_bus_message_rewind(m, !(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY));
- if (r < 0) {
- log_error_errno(-r, "Failed to rewind: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to rewind: %m");
if (!(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY))
fprintf(f, "%sMESSAGE \"%s\" {\n", indent(0, flags), strempty(m->root_container.signature));
if (!(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY))
fprintf(f, "%sMESSAGE \"%s\" {\n", indent(0, flags), strempty(m->root_container.signature));
@@
-151,20
+150,16
@@
int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
} basic;
r = sd_bus_message_peek_type(m, &type, &contents);
} basic;
r = sd_bus_message_peek_type(m, &type, &contents);
- if (r < 0) {
- log_error_errno(-r, "Failed to peek type: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to peek type: %m");
if (r == 0) {
if (level <= 1)
break;
r = sd_bus_message_exit_container(m);
if (r == 0) {
if (level <= 1)
break;
r = sd_bus_message_exit_container(m);
- if (r < 0) {
- log_error_errno(-r, "Failed to exit container: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to exit container: %m");
level--;
level--;
@@
-182,10
+177,8
@@
int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
if (bus_type_is_container(type) > 0) {
r = sd_bus_message_enter_container(m, type, contents);
if (bus_type_is_container(type) > 0) {
r = sd_bus_message_enter_container(m, type, contents);
- if (r < 0) {
- log_error_errno(-r, "Failed to enter container: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to enter container: %m");
if (type == SD_BUS_TYPE_ARRAY)
fprintf(f, "%sARRAY \"%s\" {\n", prefix, contents);
if (type == SD_BUS_TYPE_ARRAY)
fprintf(f, "%sARRAY \"%s\" {\n", prefix, contents);
@@
-202,10
+195,8
@@
int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
}
r = sd_bus_message_read_basic(m, type, &basic);
}
r = sd_bus_message_read_basic(m, type, &basic);
- if (r < 0) {
- log_error_errno(-r, "Failed to get basic: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get basic: %m");
assert(r > 0);
assert(r > 0);
@@
-300,15
+291,13
@@
static void dump_capabilities(
for (;;) {
if (r > 0) {
for (;;) {
if (r > 0) {
- _cleanup_cap_free_charp_ char *t;
if (n > 0)
fputc(' ', f);
if (n % 4 == 3)
fprintf(f, terse ? "\n " : "\n ");
if (n > 0)
fputc(' ', f);
if (n % 4 == 3)
fprintf(f, terse ? "\n " : "\n ");
- t = cap_to_name(i);
- fprintf(f, "%s", t);
+ fprintf(f, "%s", strna(capability_to_name(i)));
n++;
}
n++;
}
@@
-356,12
+345,10
@@
int bus_creds_dump(sd_bus_creds *c, FILE *f, bool terse) {
if (c->mask & SD_BUS_CREDS_PID)
fprintf(f, "%sPID=%s"PID_FMT"%s", prefix, color, c->pid, suffix);
if (c->mask & SD_BUS_CREDS_PID)
fprintf(f, "%sPID=%s"PID_FMT"%s", prefix, color, c->pid, suffix);
- if (c->mask & SD_BUS_CREDS_PID_STARTTIME)
- fprintf(f, "%sPIDStartTime=%s"USEC_FMT"%s", prefix, color, c->pid_starttime, suffix);
if (c->mask & SD_BUS_CREDS_TID)
fprintf(f, "%sTID=%s"PID_FMT"%s", prefix, color, c->tid, suffix);
if (c->mask & SD_BUS_CREDS_TID)
fprintf(f, "%sTID=%s"PID_FMT"%s", prefix, color, c->tid, suffix);
- if (terse && ((c->mask & (SD_BUS_CREDS_PID|SD_BUS_CREDS_
PID_STARTTIME|SD_BUS_CREDS_
TID))))
+ if (terse && ((c->mask & (SD_BUS_CREDS_PID|SD_BUS_CREDS_TID))))
fputs("\n", f);
if (c->mask & SD_BUS_CREDS_UID)
fputs("\n", f);
if (c->mask & SD_BUS_CREDS_UID)