X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-bus-protocol.h;h=623cee0c502d89e9376f611c7d5f92ad50845b86;hb=3e6d9bb47a4f0f7b717de2691b1b962f65851869;hp=ff2bcc93b8792633764f8addf6bae4f76c87bec7;hpb=40ca29a1370379d43e44c0ed425eecc7218dcbca;p=elogind.git
diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h
index ff2bcc93b..623cee0c5 100644
--- a/src/systemd/sd-bus-protocol.h
+++ b/src/systemd/sd-bus-protocol.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosdbusprotocolhfoo
#define foosdbusprotocolhfoo
@@ -22,11 +20,9 @@
along with systemd; If not, see .
***/
-#include
+#include "_sd-common.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+_SD_BEGIN_DECLARATIONS;
/* Types of message */
@@ -63,128 +59,12 @@ enum {
SD_BUS_TYPE_STRUCT_END = ')',
SD_BUS_TYPE_DICT_ENTRY = 'e', /* not actually used in signatures */
SD_BUS_TYPE_DICT_ENTRY_BEGIN = '{',
- SD_BUS_TYPE_DICT_ENTRY_END = '}',
-};
-
-/* Endianness */
-
-enum {
- _SD_BUS_INVALID_ENDIAN = 0,
- SD_BUS_LITTLE_ENDIAN = 'l',
- SD_BUS_BIG_ENDIAN = 'B',
-#if __BYTE_ORDER == __BIG_ENDIAN
- SD_BUS_NATIVE_ENDIAN = SD_BUS_BIG_ENDIAN,
- SD_BUS_REVERSE_ENDIAN = SD_BUS_LITTLE_ENDIAN
-#else
- SD_BUS_NATIVE_ENDIAN = SD_BUS_LITTLE_ENDIAN,
- SD_BUS_REVERSE_ENDIAN = SD_BUS_BIG_ENDIAN
-#endif
-};
-
-/* Flags */
-
-enum {
- SD_BUS_MESSAGE_NO_REPLY_EXPECTED = 1,
- SD_BUS_MESSAGE_NO_AUTO_START = 2
-};
-
-/* Header fields */
-
-enum {
- _SD_BUS_MESSAGE_HEADER_INVALID = 0,
- SD_BUS_MESSAGE_HEADER_PATH,
- SD_BUS_MESSAGE_HEADER_INTERFACE,
- SD_BUS_MESSAGE_HEADER_MEMBER,
- SD_BUS_MESSAGE_HEADER_ERROR_NAME,
- SD_BUS_MESSAGE_HEADER_REPLY_SERIAL,
- SD_BUS_MESSAGE_HEADER_DESTINATION,
- SD_BUS_MESSAGE_HEADER_SENDER,
- SD_BUS_MESSAGE_HEADER_SIGNATURE,
- SD_BUS_MESSAGE_HEADER_UNIX_FDS,
- _SD_BUS_MESSAGE_HEADER_MAX
+ SD_BUS_TYPE_DICT_ENTRY_END = '}'
};
-/* RequestName parameters */
-enum {
- SD_BUS_NAME_ALLOW_REPLACEMENT = 1,
- SD_BUS_NAME_REPLACE_EXISTING = 2,
- SD_BUS_NAME_DO_NOT_QUEUE = 4
-};
-
-/* RequestName returns */
-enum {
- SD_BUS_NAME_PRIMARY_OWNER = 1,
- SD_BUS_NAME_IN_QUEUE = 2,
- SD_BUS_NAME_EXISTS = 3,
- SD_BUS_NAME_ALREADY_OWNER = 4
-};
-
-/* ReleaseName returns */
-enum {
- SD_BUS_NAME_RELEASED = 1,
- SD_BUS_NAME_NON_EXISTENT = 2,
- SD_BUS_NAME_NOT_OWNER = 3,
-};
-
-#define SD_BUS_INTROSPECT_DOCTYPE \
- "\n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_PEER \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_INTROSPECTABLE \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_PROPERTIES \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_OBJECT_MANAGER \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n"
-
/* Well-known errors. Note that this is only a sanitized subset of the
* errors that the reference implementation generates. */
+
#define SD_BUS_ERROR_FAILED "org.freedesktop.DBus.Error.Failed"
#define SD_BUS_ERROR_NO_MEMORY "org.freedesktop.DBus.Error.NoMemory"
#define SD_BUS_ERROR_SERVICE_UNKNOWN "org.freedesktop.DBus.Error.ServiceUnknown"
@@ -212,9 +92,11 @@ enum {
#define SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN "org.freedesktop.DBus.Error.UnixProcessIdUnknown"
#define SD_BUS_ERROR_INVALID_SIGNATURE "org.freedesktop.DBus.Error.InvalidSignature"
#define SD_BUS_ERROR_INCONSISTENT_MESSAGE "org.freedesktop.DBus.Error.InconsistentMessage"
+#define SD_BUS_ERROR_MATCH_RULE_NOT_FOUND "org.freedesktop.DBus.Error.MatchRuleNotFound"
+#define SD_BUS_ERROR_MATCH_RULE_INVALID "org.freedesktop.DBus.Error.MatchRuleInvalid"
+#define SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED \
+ "org.freedesktop.DBus.Error.InteractiveAuthorizationRequired"
-#ifdef __cplusplus
-}
-#endif
+_SD_END_DECLARATIONS;
#endif