chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Rename Job.subscribed field to Job.clients
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-internal.h
diff --git
a/src/libsystemd/sd-bus/bus-internal.h
b/src/libsystemd/sd-bus/bus-internal.h
index 042d3522615977e48283d599cb3b2275be2de5ba..618e82c98f8bef1d934026009c72dd970b8c0fdc 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-internal.h
+++ b/
src/libsystemd/sd-bus/bus-internal.h
@@
-126,7
+126,6
@@
struct vtable_member {
};
typedef enum BusSlotType {
};
typedef enum BusSlotType {
- _BUS_SLOT_DISCONNECTED,
BUS_REPLY_CALLBACK,
BUS_FILTER_CALLBACK,
BUS_MATCH_CALLBACK,
BUS_REPLY_CALLBACK,
BUS_FILTER_CALLBACK,
BUS_MATCH_CALLBACK,
@@
-134,14
+133,15
@@
typedef enum BusSlotType {
BUS_NODE_ENUMERATOR,
BUS_NODE_VTABLE,
BUS_NODE_OBJECT_MANAGER,
BUS_NODE_ENUMERATOR,
BUS_NODE_VTABLE,
BUS_NODE_OBJECT_MANAGER,
+ _BUS_SLOT_INVALID = -1,
} BusSlotType;
struct sd_bus_slot {
unsigned n_ref;
sd_bus *bus;
void *userdata;
} BusSlotType;
struct sd_bus_slot {
unsigned n_ref;
sd_bus *bus;
void *userdata;
- BusSlotType type;
- bool floating;
+ BusSlotType type
:5
;
+ bool floating
:1
;
LIST_FIELDS(sd_bus_slot, slots);
LIST_FIELDS(sd_bus_slot, slots);
@@
-237,12
+237,7
@@
struct sd_bus {
Hashmap *vtable_methods;
Hashmap *vtable_properties;
Hashmap *vtable_methods;
Hashmap *vtable_properties;
- union {
- struct sockaddr sa;
- struct sockaddr_un un;
- struct sockaddr_in in;
- struct sockaddr_in6 in6;
- } sockaddr;
+ union sockaddr_union sockaddr;
socklen_t sockaddr_size;
char *kernel;
socklen_t sockaddr_size;
char *kernel;