chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-util: add a function to peek into a container and guess elogind version
[elogind.git]
/
src
/
systemd
/
sd-bus-vtable.h
diff --git
a/src/systemd/sd-bus-vtable.h
b/src/systemd/sd-bus-vtable.h
index a03221502a175b7019197bd7baef5901b0cbd59c..e8f84eb5455dc25a263a21efcae949eda6a883fa 100644
(file)
--- a/
src/systemd/sd-bus-vtable.h
+++ b/
src/systemd/sd-bus-vtable.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosdbusvtablehfoo
#define foosdbusvtablehfoo
#ifndef foosdbusvtablehfoo
#define foosdbusvtablehfoo
@@
-36,7
+34,7
@@
enum {
_SD_BUS_VTABLE_METHOD = 'M',
_SD_BUS_VTABLE_SIGNAL = 'S',
_SD_BUS_VTABLE_PROPERTY = 'P',
_SD_BUS_VTABLE_METHOD = 'M',
_SD_BUS_VTABLE_SIGNAL = 'S',
_SD_BUS_VTABLE_PROPERTY = 'P',
- _SD_BUS_VTABLE_WRITABLE_PROPERTY = 'W'
,
+ _SD_BUS_VTABLE_WRITABLE_PROPERTY = 'W'
};
enum {
};
enum {
@@
-47,6
+45,7
@@
enum {
SD_BUS_VTABLE_PROPERTY_CONST = 1ULL << 4,
SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE = 1ULL << 5,
SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION = 1ULL << 6,
SD_BUS_VTABLE_PROPERTY_CONST = 1ULL << 4,
SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE = 1ULL << 5,
SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION = 1ULL << 6,
+ SD_BUS_VTABLE_PROPERTY_EXPLICIT = 1ULL << 7,
_SD_BUS_VTABLE_CAPABILITY_MASK = 0xFFFFULL << 40
};
_SD_BUS_VTABLE_CAPABILITY_MASK = 0xFFFFULL << 40
};
@@
-67,6
+66,7
@@
struct sd_bus_vtable {
const char *signature;
const char *result;
sd_bus_message_handler_t handler;
const char *signature;
const char *result;
sd_bus_message_handler_t handler;
+ size_t offset;
} method;
struct {
const char *member;
} method;
struct {
const char *member;
@@
-89,7
+89,7
@@
struct sd_bus_vtable {
.x.start.element_size = sizeof(sd_bus_vtable), \
}
.x.start.element_size = sizeof(sd_bus_vtable), \
}
-#define SD_BUS_METHOD
(_member, _signature, _result, _handler
, _flags) \
+#define SD_BUS_METHOD
_WITH_OFFSET(_member, _signature, _result, _handler, _offset
, _flags) \
{ \
.type = _SD_BUS_VTABLE_METHOD, \
.flags = _flags, \
{ \
.type = _SD_BUS_VTABLE_METHOD, \
.flags = _flags, \
@@
-97,7
+97,10
@@
struct sd_bus_vtable {
.x.method.signature = _signature, \
.x.method.result = _result, \
.x.method.handler = _handler, \
.x.method.signature = _signature, \
.x.method.result = _result, \
.x.method.handler = _handler, \
+ .x.method.offset = _offset, \
}
}
+#define SD_BUS_METHOD(_member, _signature, _result, _handler, _flags) \
+ SD_BUS_METHOD_WITH_OFFSET(_member, _signature, _result, _handler, 0, _flags)
#define SD_BUS_SIGNAL(_member, _signature, _flags) \
{ \
#define SD_BUS_SIGNAL(_member, _signature, _flags) \
{ \