chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.freedesktop.org/git/systemd/systemd into work
[elogind.git]
/
src
/
shared
/
dbus-common.h
diff --git
a/src/shared/dbus-common.h
b/src/shared/dbus-common.h
index 394ab4cb60787b68112de5658fd704790abc5d6f..e141c9ec9003e681b13b0c32bef88a0d030f1d15 100644
(file)
--- a/
src/shared/dbus-common.h
+++ b/
src/shared/dbus-common.h
@@
-22,6
+22,8
@@
***/
#include <dbus/dbus.h>
***/
#include <dbus/dbus.h>
+#include <inttypes.h>
+#include <sys/types.h>
#ifndef DBUS_ERROR_UNKNOWN_OBJECT
#define DBUS_ERROR_UNKNOWN_OBJECT "org.freedesktop.DBus.Error.UnknownObject"
#ifndef DBUS_ERROR_UNKNOWN_OBJECT
#define DBUS_ERROR_UNKNOWN_OBJECT "org.freedesktop.DBus.Error.UnknownObject"
@@
-112,6
+114,10
@@
typedef struct BusBoundProperties {
const void *const base; /* base pointer to which the offset must be added to reach data */
} BusBoundProperties;
const void *const base; /* base pointer to which the offset must be added to reach data */
} BusBoundProperties;
+dbus_bool_t bus_maybe_send_reply (DBusConnection *c,
+ DBusMessage *message,
+ DBusMessage *reply);
+
DBusHandlerResult bus_send_error_reply(
DBusConnection *c,
DBusMessage *message,
DBusHandlerResult bus_send_error_reply(
DBusConnection *c,
DBusMessage *message,
@@
-191,6
+197,7
@@
unsigned bus_events_to_flags(uint32_t events);
int bus_parse_strv(DBusMessage *m, char ***_l);
int bus_parse_strv_iter(DBusMessageIter *iter, char ***_l);
int bus_parse_strv(DBusMessage *m, char ***_l);
int bus_parse_strv_iter(DBusMessageIter *iter, char ***_l);
+int bus_parse_strv_pairs_iter(DBusMessageIter *iter, char ***_l);
int bus_append_strv_iter(DBusMessageIter *iter, char **l);
int bus_append_strv_iter(DBusMessageIter *iter, char **l);
@@
-219,3
+226,4
@@
const char *bus_message_get_sender_with_fallback(DBusMessage *m);
void bus_message_unrefp(DBusMessage **reply);
#define _cleanup_dbus_message_unref_ __attribute__((cleanup(bus_message_unrefp)))
void bus_message_unrefp(DBusMessage **reply);
#define _cleanup_dbus_message_unref_ __attribute__((cleanup(bus_message_unrefp)))
+#define _cleanup_dbus_error_free_ __attribute__((cleanup(dbus_error_free)))