core: Make various ActivationDetails functions take a const argument

diff --git a/src/core/path.c b/src/core/path.c
index c2e8fa7cca182789fd27bcc09c1573f063743e72..d62a83cc94906b80972e5dffe3eb4e93176d779d 100644 (file)
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -919,8 +919,8 @@ static void activation_details_path_done(ActivationDetails *details) {
         p->trigger_path_filename = mfree(p->trigger_path_filename);
 }
 
-static void activation_details_path_serialize(ActivationDetails *details, FILE *f) {
-        ActivationDetailsPath *p = ASSERT_PTR(ACTIVATION_DETAILS_PATH(details));
+static void activation_details_path_serialize(const ActivationDetails *details, FILE *f) {
+        const ActivationDetailsPath *p = ASSERT_PTR(ACTIVATION_DETAILS_PATH(details));
 
         assert(f);
 
@@ -951,8 +951,8 @@ static int activation_details_path_deserialize(const char *key, const char *valu
         return 0;
 }
 
-static int activation_details_path_append_env(ActivationDetails *details, char ***strv) {
-        ActivationDetailsPath *p = ASSERT_PTR(ACTIVATION_DETAILS_PATH(details));
+static int activation_details_path_append_env(const ActivationDetails *details, char ***strv) {
+        const ActivationDetailsPath *p = ASSERT_PTR(ACTIVATION_DETAILS_PATH(details));
         char *s;
         int r;
 
@@ -972,8 +972,8 @@ static int activation_details_path_append_env(ActivationDetails *details, char *
         return 1; /* Return the number of variables added to the env block */
 }
 
-static int activation_details_path_append_pair(ActivationDetails *details, char ***strv) {
-        ActivationDetailsPath *p = ASSERT_PTR(ACTIVATION_DETAILS_PATH(details));
+static int activation_details_path_append_pair(const ActivationDetails *details, char ***strv) {
+        const ActivationDetailsPath *p = ASSERT_PTR(ACTIVATION_DETAILS_PATH(details));
         int r;
 
         assert(strv);

diff --git a/src/core/timer.c b/src/core/timer.c
index 14dd44e3620583361cd54b4f4db3b27eb94b9e39..e4d831fd9bea6f6d2cfdc5017fa242f8b7e1678f 100644 (file)
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -905,8 +905,8 @@ static int timer_can_start(Unit *u) {
         return 1;
 }
 
-static void activation_details_timer_serialize(ActivationDetails *details, FILE *f) {
-        ActivationDetailsTimer *t = ASSERT_PTR(ACTIVATION_DETAILS_TIMER(details));
+static void activation_details_timer_serialize(const ActivationDetails *details, FILE *f) {
+        const ActivationDetailsTimer *t = ASSERT_PTR(ACTIVATION_DETAILS_TIMER(details));
 
         assert(f);
         assert(t);
@@ -937,8 +937,8 @@ static int activation_details_timer_deserialize(const char *key, const char *val
         return 0;
 }
 
-static int activation_details_timer_append_env(ActivationDetails *details, char ***strv) {
-        ActivationDetailsTimer *t = ASSERT_PTR(ACTIVATION_DETAILS_TIMER(details));
+static int activation_details_timer_append_env(const ActivationDetails *details, char ***strv) {
+        const ActivationDetailsTimer *t = ASSERT_PTR(ACTIVATION_DETAILS_TIMER(details));
         int r;
 
         assert(strv);
@@ -958,8 +958,8 @@ static int activation_details_timer_append_env(ActivationDetails *details, char
         return 2; /* Return the number of variables added to the env block */
 }
 
-static int activation_details_timer_append_pair(ActivationDetails *details, char ***strv) {
-        ActivationDetailsTimer *t = ASSERT_PTR(ACTIVATION_DETAILS_TIMER(details));
+static int activation_details_timer_append_pair(const ActivationDetails *details, char ***strv) {
+        const ActivationDetailsTimer *t = ASSERT_PTR(ACTIVATION_DETAILS_TIMER(details));
         int r;
 
         assert(strv);

diff --git a/src/core/unit.c b/src/core/unit.c
index 6b19947df0680ae54dec10c922c44bc2133e5191..3845d7c39facafa1b9fa9e134e5ad0a5c4a67e2e 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -6747,7 +6747,7 @@ static ActivationDetails *activation_details_free(ActivationDetails *details) {
         return mfree(details);
 }
 
-void activation_details_serialize(ActivationDetails *details, FILE *f) {
+void activation_details_serialize(const ActivationDetails *details, FILE *f) {
         if (!details || details->trigger_unit_type == _UNIT_TYPE_INVALID)
                 return;
 
@@ -6805,7 +6805,7 @@ int activation_details_deserialize(const char *key, const char *value, Activatio
         return -EINVAL;
 }
 
-int activation_details_append_env(ActivationDetails *details, char ***strv) {
+int activation_details_append_env(const ActivationDetails *details, char ***strv) {
         int r = 0;
 
         assert(strv);
@@ -6832,7 +6832,7 @@ int activation_details_append_env(ActivationDetails *details, char ***strv) {
         return r + !isempty(details->trigger_unit_name); /* Return the number of variables added to the env block */
 }
 
-int activation_details_append_pair(ActivationDetails *details, char ***strv) {
+int activation_details_append_pair(const ActivationDetails *details, char ***strv) {
         int r = 0;
 
         assert(strv);

diff --git a/src/core/unit.h b/src/core/unit.h
index 4102abd09187704dbb94ff55fa56d2dab7faa53e..cb6f6e070c1b1df7d5f05075f78262a80e5f034b 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -148,7 +148,7 @@ typedef struct ActivationDetails {
 
 /* For casting an activation event into the various unit-specific types */
 #define DEFINE_ACTIVATION_DETAILS_CAST(UPPERCASE, MixedCase, UNIT_TYPE)         \
-        static inline MixedCase* UPPERCASE(ActivationDetails *a) {              \
+        static inline MixedCase* UPPERCASE(const ActivationDetails *a) {              \
                 if (_unlikely_(!a || a->trigger_unit_type != UNIT_##UNIT_TYPE)) \
                         return NULL;                                            \
                                                                                 \
@@ -166,10 +166,10 @@ typedef struct ActivationDetails {
 ActivationDetails *activation_details_new(Unit *trigger_unit);
 ActivationDetails *activation_details_ref(ActivationDetails *p);
 ActivationDetails *activation_details_unref(ActivationDetails *p);
-void activation_details_serialize(ActivationDetails *p, FILE *f);
+void activation_details_serialize(const ActivationDetails *p, FILE *f);
 int activation_details_deserialize(const char *key, const char *value, ActivationDetails **info);
-int activation_details_append_env(ActivationDetails *info, char ***strv);
-int activation_details_append_pair(ActivationDetails *info, char ***strv);
+int activation_details_append_env(const ActivationDetails *info, char ***strv);
+int activation_details_append_pair(const ActivationDetails *info, char ***strv);
 DEFINE_TRIVIAL_CLEANUP_FUNC(ActivationDetails*, activation_details_unref);
 
 typedef struct ActivationDetailsVTable {
@@ -184,18 +184,18 @@ typedef struct ActivationDetailsVTable {
         void (*done)(ActivationDetails *info);
 
         /* This should serialize all type-specific variables. */
-        void (*serialize)(ActivationDetails *info, FILE *f);
+        void (*serialize)(const ActivationDetails *info, FILE *f);
 
         /* This should deserialize all type-specific variables, one at a time. */
         int (*deserialize)(const char *key, const char *value, ActivationDetails **info);
 
         /* This should format the type-specific variables for the env block of the spawned service,
          * and return the number of added items. */
-        int (*append_env)(ActivationDetails *info, char ***strv);
+        int (*append_env)(const ActivationDetails *info, char ***strv);
 
         /* This should append type-specific variables as key/value pairs for the D-Bus property of the job,
          * and return the number of added pairs. */
-        int (*append_pair)(ActivationDetails *info, char ***strv);
+        int (*append_pair)(const ActivationDetails *info, char ***strv);
 } ActivationDetailsVTable;
 
 extern const ActivationDetailsVTable * const activation_details_vtable[_UNIT_TYPE_MAX];