sd-bus: move SD_BUS_MAXIMUM_(SIGNATURE|NAME)_LENGTH to sd-bus-protocol.h

So far we kept all defines directly originating from the spec in
sd-bus-protocol.h, do this for this too.

The precise place doesn't matter much API-wise given that sd-bus.h includes
sd-bus-protocol.h, hence let's just clean this up.

diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h
index a3f4e743597ad0ca4f9344f1ba22ce2dd9af8da7..8883ec62b916dff47bb8ce823c1a06e6cfe2b1fd 100644 (file)
--- a/src/systemd/sd-bus-protocol.h
+++ b/src/systemd/sd-bus-protocol.h
@@ -94,6 +94,12 @@ enum {
 #define SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED \
                                                 "org.freedesktop.DBus.Error.InteractiveAuthorizationRequired"
 
+/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-marshaling-signature */
+#define SD_BUS_MAXIMUM_SIGNATURE_LENGTH 255
+
+/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names */
+#define SD_BUS_MAXIMUM_NAME_LENGTH 255
+
 _SD_END_DECLARATIONS;
 
 #endif

diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 787bc71271b97c488dd5fd735a2ceebc0948ad6d..9c37e7e6c97550416cb861cf3774d657a4152d05 100644 (file)
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -34,12 +34,6 @@ _SD_BEGIN_DECLARATIONS;
 #define SD_BUS_DEFAULT_USER ((sd_bus *) 2)
 #define SD_BUS_DEFAULT_SYSTEM ((sd_bus *) 3)
 
-/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-marshaling-signature */
-#define SD_BUS_MAXIMUM_SIGNATURE_LENGTH 255
-
-/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names */
-#define SD_BUS_MAXIMUM_NAME_LENGTH 255
-
 /* Types */
 
 typedef struct sd_bus sd_bus;