install,dbus-manager: make unit_file_* take (char* const*) for strv

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 2515f54adac370e0d1a54c3cf0fdcb82f9c0e2b2..2fc4161b813dcd15587d7463ed337c65596dc137 100644 (file)
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -2425,7 +2425,7 @@ static int reply_install_changes_and_free(
 static int method_enable_unit_files_generic(
                 sd_bus_message *message,
                 Manager *m,
-                int (*call)(RuntimeScope scope, UnitFileFlags flags, const char *root_dir, char *files[], InstallChange **changes, size_t *n_changes),
+                int (*call)(RuntimeScope scope, UnitFileFlags flags, const char *root_dir, char * const *files, InstallChange **changes, size_t *n_changes),
                 bool carries_install_info,
                 sd_bus_error *error) {
 
@@ -2490,7 +2490,7 @@ static int method_link_unit_files(sd_bus_message *message, void *userdata, sd_bu
         return method_enable_unit_files_generic(message, userdata, unit_file_link, /* carries_install_info = */ false, error);
 }
 
-static int unit_file_preset_without_mode(RuntimeScope scope, UnitFileFlags flags, const char *root_dir, char **files, InstallChange **changes, size_t *n_changes) {
+static int unit_file_preset_without_mode(RuntimeScope scope, UnitFileFlags flags, const char *root_dir, char * const *files, InstallChange **changes, size_t *n_changes) {
         return unit_file_preset(scope, flags, root_dir, files, UNIT_FILE_PRESET_FULL, changes, n_changes);
 }
 
@@ -2550,7 +2550,7 @@ static int method_preset_unit_files_with_mode(sd_bus_message *message, void *use
 static int method_disable_unit_files_generic(
                 sd_bus_message *message,
                 Manager *m,
-                int (*call)(RuntimeScope scope, UnitFileFlags flags, const char *root_dir, char *files[], InstallChange **changes, size_t *n_changes),
+                int (*call)(RuntimeScope scope, UnitFileFlags flags, const char *root_dir, char * const *files, InstallChange **changes, size_t *n_changes),
                 bool carries_install_info,
                 sd_bus_error *error) {
 

diff --git a/src/shared/install.c b/src/shared/install.c
index e2072b45ba9f482bf754a2db355de2da5ef3c037..793f2f6ecd53d8759b37e2f6a724af7139c13df1 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -2306,7 +2306,7 @@ int unit_file_mask(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 InstallChange **changes,
                 size_t *n_changes) {
 
@@ -2349,7 +2349,7 @@ int unit_file_unmask(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 InstallChange **changes,
                 size_t *n_changes) {
 
@@ -2461,7 +2461,7 @@ int unit_file_link(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **files,
+                char * const *files,
                 InstallChange **changes,
                 size_t *n_changes) {
 
@@ -2563,7 +2563,7 @@ static int path_shall_revert(const LookupPaths *lp, const char *path) {
 int unit_file_revert(
                 RuntimeScope scope,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 InstallChange **changes,
                 size_t *n_changes) {
 
@@ -2720,7 +2720,7 @@ int unit_file_add_dependency(
                 RuntimeScope scope,
                 UnitFileFlags file_flags,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 const char *target,
                 UnitDependency dep,
                 InstallChange **changes,
@@ -2792,7 +2792,7 @@ static int do_unit_file_enable(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *config_path,
-                char **names_or_paths,
+                char * const *names_or_paths,
                 InstallChange **changes,
                 size_t *n_changes) {
 
@@ -2823,7 +2823,7 @@ int unit_file_enable(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names_or_paths,
+                char * const *names_or_paths,
                 InstallChange **changes,
                 size_t *n_changes) {
 
@@ -2849,7 +2849,7 @@ static int do_unit_file_disable(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *config_path,
-                char **names,
+                char * const *names,
                 InstallChange **changes,
                 size_t *n_changes) {
 
@@ -2891,7 +2891,7 @@ int unit_file_disable(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **files,
+                char * const *files,
                 InstallChange **changes,
                 size_t *n_changes) {
 
@@ -2915,7 +2915,7 @@ int unit_file_disable(
 static int normalize_linked_files(
                 RuntimeScope scope,
                 const LookupPaths *lp,
-                char **names_or_paths,
+                char * const *names_or_paths,
                 char ***ret_names,
                 char ***ret_files) {
 
@@ -2974,7 +2974,7 @@ int unit_file_reenable(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names_or_paths,
+                char * const *names_or_paths,
                 InstallChange **changes,
                 size_t *n_changes) {
 
@@ -3491,7 +3491,7 @@ static int execute_preset(
                 InstallContext *minus,
                 const LookupPaths *lp,
                 const char *config_path,
-                char **files,
+                char * const *files,
                 UnitFilePresetMode mode,
                 InstallChange **changes,
                 size_t *n_changes) {
@@ -3590,7 +3590,7 @@ int unit_file_preset(
                 RuntimeScope scope,
                 UnitFileFlags file_flags,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 UnitFilePresetMode mode,
                 InstallChange **changes,
                 size_t *n_changes) {

diff --git a/src/shared/install.h b/src/shared/install.h
index 13d163030c7011756bc28404fc295a6d65e30212..c8308837ffa788b238bcd5ff166e7942cdeab27d 100644 (file)
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -106,28 +106,28 @@ int unit_file_enable(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names_or_paths,
+                char * const *names_or_paths,
                 InstallChange **changes,
                 size_t *n_changes);
 int unit_file_disable(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 InstallChange **changes,
                 size_t *n_changes);
 int unit_file_reenable(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names_or_paths,
+                char * const *names_or_paths,
                 InstallChange **changes,
                 size_t *n_changes);
 int unit_file_preset(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 UnitFilePresetMode mode,
                 InstallChange **changes,
                 size_t *n_changes);
@@ -142,27 +142,27 @@ int unit_file_mask(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 InstallChange **changes,
                 size_t *n_changes);
 int unit_file_unmask(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 InstallChange **changes,
                 size_t *n_changes);
 int unit_file_link(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **files,
+                char * const *files,
                 InstallChange **changes,
                 size_t *n_changes);
 int unit_file_revert(
                 RuntimeScope scope,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 InstallChange **changes,
                 size_t *n_changes);
 int unit_file_set_default(
@@ -180,7 +180,7 @@ int unit_file_add_dependency(
                 RuntimeScope scope,
                 UnitFileFlags flags,
                 const char *root_dir,
-                char **names,
+                char * const *names,
                 const char *target,
                 UnitDependency dep,
                 InstallChange **changes,