X Tutup
Skip to content

Commit 27cf4c1

Browse files
keszybzkeszybz
committed
sd-bus: make dump flags public
1 parent c7d26ac commit 27cf4c1

File tree

8 files changed

+31
-31
lines changed

8 files changed

+31
-31
lines changed

‎src/busctl/busctl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ static int introspect(int argc, char **argv, void *userdata) {
11581158
}
11591159

11601160
static int message_dump(sd_bus_message *m, FILE *f) {
1161-
return bus_message_dump(m, f, BUS_MESSAGE_DUMP_WITH_HEADER);
1161+
return bus_message_dump(m, f, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
11621162
}
11631163

11641164
static int message_pcap(sd_bus_message *m, FILE *f) {
@@ -2158,7 +2158,7 @@ static int get_property(int argc, char **argv, void *userdata) {
21582158
} else if (arg_verbose) {
21592159
(void) pager_open(arg_pager_flags);
21602160

2161-
r = bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_SUBTREE_ONLY);
2161+
r = bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY);
21622162
if (r < 0)
21632163
return r;
21642164
} else {

‎src/fuzz/fuzz-bus-message.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
3636
if (getenv_bool("SYSTEMD_FUZZ_OUTPUT") <= 0)
3737
assert_se(g = open_memstream_unlocked(&out, &out_size));
3838

39-
bus_message_dump(m, g ?: stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
39+
bus_message_dump(m, g ?: stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
4040

4141
r = sd_bus_message_rewind(m, true);
4242
assert_se(r >= 0);

‎src/libsystemd/sd-bus/bus-dump.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@
1818
#include "terminal-util.h"
1919
#include "util.h"
2020

21-
static char *indent(unsigned level, unsigned flags) {
21+
static char *indent(unsigned level, uint64_t flags) {
2222
char *p;
2323
unsigned n, i = 0;
2424

2525
n = 0;
2626

27-
if (flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY && level > 0)
27+
if (flags & SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY && level > 0)
2828
level -= 1;
2929

30-
if (flags & BUS_MESSAGE_DUMP_WITH_HEADER)
30+
if (flags & SD_BUS_MESSAGE_DUMP_WITH_HEADER)
3131
n += 2;
3232

3333
p = new(char, n + level*8 + 1);
3434
if (!p)
3535
return NULL;
3636

37-
if (flags & BUS_MESSAGE_DUMP_WITH_HEADER) {
37+
if (flags & SD_BUS_MESSAGE_DUMP_WITH_HEADER) {
3838
p[i++] = ' ';
3939
p[i++] = ' ';
4040
}
@@ -45,7 +45,7 @@ static char *indent(unsigned level, unsigned flags) {
4545
return p;
4646
}
4747

48-
int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
48+
int bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) {
4949
unsigned level = 1;
5050
int r;
5151

@@ -54,7 +54,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
5454
if (!f)
5555
f = stdout;
5656

57-
if (flags & BUS_MESSAGE_DUMP_WITH_HEADER) {
57+
if (flags & SD_BUS_MESSAGE_DUMP_WITH_HEADER) {
5858
fprintf(f,
5959
"%s%s%s Type=%s%s%s Endian=%c Flags=%u Version=%u Priority=%"PRIi64,
6060
m->header->type == SD_BUS_MESSAGE_METHOD_ERROR ? ansi_highlight_red() :
@@ -118,11 +118,11 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
118118
bus_creds_dump(&m->creds, f, true);
119119
}
120120

121-
r = sd_bus_message_rewind(m, !(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY));
121+
r = sd_bus_message_rewind(m, !(flags & SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY));
122122
if (r < 0)
123123
return log_error_errno(r, "Failed to rewind: %m");
124124

125-
if (!(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY)) {
125+
if (!(flags & SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY)) {
126126
_cleanup_free_ char *prefix = NULL;
127127

128128
prefix = indent(0, flags);
@@ -259,7 +259,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
259259
}
260260
}
261261

262-
if (!(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY)) {
262+
if (!(flags & SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY)) {
263263
_cleanup_free_ char *prefix = NULL;
264264

265265
prefix = indent(0, flags);

‎src/libsystemd/sd-bus/bus-dump.h‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66

77
#include "sd-bus.h"
88

9-
enum {
10-
BUS_MESSAGE_DUMP_WITH_HEADER = 1 << 0,
11-
BUS_MESSAGE_DUMP_SUBTREE_ONLY = 1 << 1,
12-
};
13-
14-
int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags);
9+
int bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags);
1510

1611
int bus_creds_dump(sd_bus_creds *c, FILE *f, bool terse);
1712

‎src/libsystemd/sd-bus/test-bus-gvariant.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static int test_marshal(void) {
175175
}
176176
#endif
177177

178-
assert_se(bus_message_dump(m, NULL, BUS_MESSAGE_DUMP_WITH_HEADER) >= 0);
178+
assert_se(bus_message_dump(m, NULL, SD_BUS_MESSAGE_DUMP_WITH_HEADER) >= 0);
179179

180180
assert_se(bus_message_get_blob(m, &blob, &sz) >= 0);
181181

@@ -196,7 +196,7 @@ static int test_marshal(void) {
196196
assert_se(bus_message_from_malloc(bus, blob, sz, NULL, 0, NULL, &n) >= 0);
197197
blob = NULL;
198198

199-
assert_se(bus_message_dump(n, NULL, BUS_MESSAGE_DUMP_WITH_HEADER) >= 0);
199+
assert_se(bus_message_dump(n, NULL, SD_BUS_MESSAGE_DUMP_WITH_HEADER) >= 0);
200200

201201
m = sd_bus_message_unref(m);
202202

@@ -205,7 +205,7 @@ static int test_marshal(void) {
205205
assert_se(sd_bus_message_append(m, "as", 0) >= 0);
206206

207207
assert_se(sd_bus_message_seal(m, 4712, 0) >= 0);
208-
assert_se(bus_message_dump(m, NULL, BUS_MESSAGE_DUMP_WITH_HEADER) >= 0);
208+
assert_se(bus_message_dump(m, NULL, SD_BUS_MESSAGE_DUMP_WITH_HEADER) >= 0);
209209

210210
return EXIT_SUCCESS;
211211
}

‎src/libsystemd/sd-bus/test-bus-marshal.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ int main(int argc, char *argv[]) {
188188
r = sd_bus_message_seal(m, 4711, 0);
189189
assert_se(r >= 0);
190190

191-
bus_message_dump(m, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
191+
bus_message_dump(m, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
192192

193193
ms = open_memstream_unlocked(&first, &first_size);
194194
bus_message_dump(m, ms, 0);
@@ -244,7 +244,7 @@ int main(int argc, char *argv[]) {
244244
r = bus_message_from_malloc(bus, buffer, sz, NULL, 0, NULL, &m);
245245
assert_se(r >= 0);
246246

247-
bus_message_dump(m, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
247+
bus_message_dump(m, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
248248

249249
fclose(ms);
250250
ms = open_memstream_unlocked(&second, &second_size);

‎src/libsystemd/sd-bus/test-bus-objects.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ static int client(struct context *c) {
399399
r = sd_bus_call_method(bus, "org.freedesktop.systemd.test", "/foo", "org.freedesktop.DBus.Properties", "GetAll", &error, &reply, "s", "");
400400
assert_se(r >= 0);
401401

402-
bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
402+
bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
403403

404404
sd_bus_message_unref(reply);
405405
reply = NULL;
@@ -417,7 +417,7 @@ static int client(struct context *c) {
417417
r = sd_bus_call_method(bus, "org.freedesktop.systemd.test", "/value", "org.freedesktop.DBus.ObjectManager", "GetManagedObjects", &error, &reply, "");
418418
assert_se(r >= 0);
419419

420-
bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
420+
bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
421421

422422
sd_bus_message_unref(reply);
423423
reply = NULL;
@@ -429,7 +429,7 @@ static int client(struct context *c) {
429429
assert_se(r > 0);
430430

431431
assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.Properties", "PropertiesChanged"));
432-
bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
432+
bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
433433

434434
sd_bus_message_unref(reply);
435435
reply = NULL;
@@ -441,7 +441,7 @@ static int client(struct context *c) {
441441
assert_se(r > 0);
442442

443443
assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.Properties", "PropertiesChanged"));
444-
bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
444+
bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
445445

446446
sd_bus_message_unref(reply);
447447
reply = NULL;
@@ -453,7 +453,7 @@ static int client(struct context *c) {
453453
assert_se(r > 0);
454454

455455
assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.ObjectManager", "InterfacesAdded"));
456-
bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
456+
bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
457457

458458
sd_bus_message_unref(reply);
459459
reply = NULL;
@@ -465,7 +465,7 @@ static int client(struct context *c) {
465465
assert_se(r > 0);
466466

467467
assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.ObjectManager", "InterfacesRemoved"));
468-
bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
468+
bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
469469

470470
sd_bus_message_unref(reply);
471471
reply = NULL;
@@ -477,7 +477,7 @@ static int client(struct context *c) {
477477
assert_se(r > 0);
478478

479479
assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.ObjectManager", "InterfacesAdded"));
480-
bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
480+
bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
481481

482482
sd_bus_message_unref(reply);
483483
reply = NULL;
@@ -489,7 +489,7 @@ static int client(struct context *c) {
489489
assert_se(r > 0);
490490

491491
assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.ObjectManager", "InterfacesRemoved"));
492-
bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
492+
bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
493493

494494
sd_bus_message_unref(reply);
495495
reply = NULL;

‎src/systemd/sd-bus.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ enum {
105105
SD_BUS_NAME_QUEUE = 1ULL << 2
106106
};
107107

108+
enum {
109+
SD_BUS_MESSAGE_DUMP_WITH_HEADER = 1ULL << 0,
110+
SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY = 1ULL << 1,
111+
};
112+
108113
/* Callbacks */
109114

110115
typedef int (*sd_bus_message_handler_t)(sd_bus_message *m, void *userdata, sd_bus_error *ret_error);

0 commit comments

Comments
 (0)
X Tutup