X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemd%2Fsd-bus.h;h=45b264ab1c5d635c0a1318a4db2022d53c6388fd;hp=fd87de0813aed7bcaa8233a3aa96e348edc4a86f;hb=b6b7d4337976eeac610b9ed2c3e1fd596a247b14;hpb=917b5dc7075a15bded4948efba8e686dba4509f8

diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index fd87de081..45b264ab1 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -33,6 +33,8 @@ extern "C" {
 #endif
 
 /* TODO:
+ * - rewrite message_read_ap() and message_append_ap() to be non-recursive.
+ *
  * - add page donation logic
  * - api for appending/reading fixed arrays
  * - merge busctl into systemctl or so?
@@ -149,6 +151,8 @@ int sd_bus_message_rewind(sd_bus_message *m, int complete);
 
 int sd_bus_emit_signal(sd_bus *bus, const char *path, const char *interface, const char *member, const char *types, ...);
 int sd_bus_call_method(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *error, sd_bus_message **reply, const char *types, ...);
+int sd_bus_reply_method_return(sd_bus *bus, sd_bus_message *call, const char *types, ...);
+int sd_bus_reply_method_error(sd_bus *bus, sd_bus_message *call, const sd_bus_error *e);
 
 /* Bus management */
 
@@ -162,8 +166,8 @@ int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid);
 
 /* Error structures */
 
-#define SD_BUS_ERROR_INIT {NULL, NULL, 0}
-#define SD_BUS_ERROR_INIT_CONST(name, message) {(name), (message), 0}
+#define SD_BUS_ERROR_NULL ((sd_bus_error) {NULL, NULL, 0})
+#define SD_BUS_ERROR_MAKE(name, message) ((sd_bus_error) {(name), (message), 0})
 
 void sd_bus_error_free(sd_bus_error *e);
 int sd_bus_error_set(sd_bus_error *e, const char *name, const char *format, ...);