chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v225: Applying various fixes and changes to src/libelogind/sd-bus that got lost...
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-internal.h
diff --git
a/src/libelogind/sd-bus/bus-internal.h
b/src/libelogind/sd-bus/bus-internal.h
index 1351938c80e7f0294831b441329a4fcd7311b1de..efee735b9c6592605a87439679ab46bf1ebdbeec 100644
(file)
--- a/
src/libelogind/sd-bus/bus-internal.h
+++ b/
src/libelogind/sd-bus/bus-internal.h
@@
-141,6
+141,7
@@
struct sd_bus_slot {
void *userdata;
BusSlotType type:5;
bool floating:1;
void *userdata;
BusSlotType type:5;
bool floating:1;
+ bool match_added:1;
char *description;
LIST_FIELDS(sd_bus_slot, slots);
char *description;
LIST_FIELDS(sd_bus_slot, slots);
@@
-261,7
+262,7
@@
struct sd_bus {
usec_t auth_timeout;
struct ucred ucred;
usec_t auth_timeout;
struct ucred ucred;
- char
label[NAME_MAX]
;
+ char
*label
;
uint64_t creds_mask;
uint64_t creds_mask;
@@
-343,7
+344,7
@@
struct sd_bus {
bool interface_name_is_valid(const char *p) _pure_;
bool service_name_is_valid(const char *p) _pure_;
bool interface_name_is_valid(const char *p) _pure_;
bool service_name_is_valid(const char *p) _pure_;
-char* service_name_startswith(const char *a, const char *b);
+
// UNNEEDED
char* service_name_startswith(const char *a, const char *b);
bool member_name_is_valid(const char *p) _pure_;
bool object_path_is_valid(const char *p) _pure_;
char *object_path_startswith(const char *a, const char *b) _pure_;
bool member_name_is_valid(const char *p) _pure_;
bool object_path_is_valid(const char *p) _pure_;
char *object_path_startswith(const char *a, const char *b) _pure_;
@@
-387,6
+388,14
@@
int bus_set_address_user(sd_bus *bus);
int bus_set_address_system_remote(sd_bus *b, const char *host);
int bus_set_address_system_machine(sd_bus *b, const char *machine);
int bus_set_address_system_remote(sd_bus *b, const char *host);
int bus_set_address_system_machine(sd_bus *b, const char *machine);
-int bus_remove_match_by_string(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata);
+
// UNNEEDED
int bus_remove_match_by_string(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata);
int bus_get_root_path(sd_bus *bus);
int bus_get_root_path(sd_bus *bus);
+
+int bus_maybe_reply_error(sd_bus_message *m, int r, sd_bus_error *error);
+
+#define bus_assert_return(expr, r, error) \
+ do { \
+ if (!assert_log(expr)) \
+ return sd_bus_error_set_errno(error, r); \
+ } while (false)