shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 02:21:44 +03:00
Code

Merge pull request #20339 from poettering/bus-vtable-indent-fix

Browse Source 
sd-bus: fix indentation in macros
This commit is contained in:
Lennart Poettering 2021-07-29 10:46:50 +02:00 committed by GitHub
commit 78d4d37401
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/systemd/sd-bus-vtable.h
View File

@ -76,7 +76,10 @@ struct sd_bus_vtable {
const unsigned *vtable_format_reference; const unsigned *vtable_format_reference;
} start; } start;
struct { struct {
size_t reserved; /* This field exists only to make sure we have something to initialize in
* SD_BUS_VTABLE_END in a way that is both compatible with pedantic versions of C and
* C++. It's unused otherwise. */
size_t _reserved;
} end; } end;
struct { struct {
const char *member; const char *member;
@ -106,11 +109,11 @@ struct sd_bus_vtable {
.type = _SD_BUS_VTABLE_START, \ .type = _SD_BUS_VTABLE_START, \
.flags = _flags, \ .flags = _flags, \
.x = { \ .x = { \
.start = { \ .start = { \
.element_size = sizeof(sd_bus_vtable), \ .element_size = sizeof(sd_bus_vtable), \
.features = _SD_BUS_VTABLE_PARAM_NAMES, \ .features = _SD_BUS_VTABLE_PARAM_NAMES, \
.vtable_format_reference = &sd_bus_object_vtable_format, \ .vtable_format_reference = &sd_bus_object_vtable_format, \
}, \ }, \
}, \ }, \
} }
@ -122,14 +125,14 @@ struct sd_bus_vtable {
.type = _SD_BUS_VTABLE_METHOD, \ .type = _SD_BUS_VTABLE_METHOD, \
.flags = _flags, \ .flags = _flags, \
.x = { \ .x = { \
.method = { \ .method = { \
.member = _member, \ .member = _member, \
.signature = _signature, \ .signature = _signature, \
.result = _result, \ .result = _result, \
.handler = _handler, \ .handler = _handler, \
.offset = _offset, \ .offset = _offset, \
.names = _in_names _out_names, \ .names = _in_names _out_names, \
}, \ }, \
}, \ }, \
} }
#define SD_BUS_METHOD_WITH_OFFSET(_member, _signature, _result, _handler, _offset, _flags) \ #define SD_BUS_METHOD_WITH_OFFSET(_member, _signature, _result, _handler, _offset, _flags) \
@ -144,14 +147,14 @@ struct sd_bus_vtable {
.type = _SD_BUS_VTABLE_SIGNAL, \ .type = _SD_BUS_VTABLE_SIGNAL, \
.flags = _flags, \ .flags = _flags, \
.x = { \ .x = { \
.signal = { \ .signal = { \
.member = _member, \ .member = _member, \
.signature = _signature, \ .signature = _signature, \
.names = _out_names, \ .names = _out_names, \
}, \ }, \
}, \ }, \
} }
#define SD_BUS_SIGNAL(_member, _signature, _flags) \ #define SD_BUS_SIGNAL(_member, _signature, _flags) \
SD_BUS_SIGNAL_WITH_NAMES(_member, _signature, "", _flags) SD_BUS_SIGNAL_WITH_NAMES(_member, _signature, "", _flags)
#define SD_BUS_PROPERTY(_member, _signature, _get, _offset, _flags) \ #define SD_BUS_PROPERTY(_member, _signature, _get, _offset, _flags) \
@ -159,13 +162,13 @@ struct sd_bus_vtable {
.type = _SD_BUS_VTABLE_PROPERTY, \ .type = _SD_BUS_VTABLE_PROPERTY, \
.flags = _flags, \ .flags = _flags, \
.x = { \ .x = { \
.property = { \ .property = { \
.member = _member, \ .member = _member, \
.signature = _signature, \ .signature = _signature, \
.get = _get, \ .get = _get, \
.set = NULL, \ .set = NULL, \
.offset = _offset, \ .offset = _offset, \
}, \ }, \
}, \ }, \
} }
@ -174,13 +177,13 @@ struct sd_bus_vtable {
.type = _SD_BUS_VTABLE_WRITABLE_PROPERTY, \ .type = _SD_BUS_VTABLE_WRITABLE_PROPERTY, \
.flags = _flags, \ .flags = _flags, \
.x = { \ .x = { \
.property = { \ .property = { \
.member = _member, \ .member = _member, \
.signature = _signature, \ .signature = _signature, \
.get = _get, \ .get = _get, \
.set = _set, \ .set = _set, \
.offset = _offset, \ .offset = _offset, \
}, \ }, \
}, \ }, \
} }
@ -189,9 +192,9 @@ struct sd_bus_vtable {
.type = _SD_BUS_VTABLE_END, \ .type = _SD_BUS_VTABLE_END, \
.flags = 0, \ .flags = 0, \
.x = { \ .x = { \
.end = { \ .end = { \
.reserved = 0, \ ._reserved = 0, \
}, \ }, \
}, \ }, \
} }