From fb2cfa6c1304cafa38016729942a0a3af4fd3620 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Sep 2020 23:49:44 +0200 Subject: [PATCH] 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. --- src/systemd/sd-bus-protocol.h | 6 ++++++ src/systemd/sd-bus.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h index a3f4e74359..8883ec62b9 100644 --- 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 787bc71271..9c37e7e6c9 100644 --- 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; -- 2.25.1