From 7195aa42e3d3c2b51da5f0ddefa74bd0925441be Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 27 Dec 2013 00:16:39 -0500 Subject: [PATCH 1/1] shared/install: use char** convention for strvs --- src/shared/install.c | 14 +++++++------- src/shared/install.h | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c index 62151d99d..1f9d7e2e3 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -556,7 +556,7 @@ int unit_file_mask( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -625,7 +625,7 @@ int unit_file_unmask( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, UnitFileChange **changes, unsigned *n_changes) { @@ -690,7 +690,7 @@ int unit_file_link( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -1462,7 +1462,7 @@ int unit_file_enable( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -1502,7 +1502,7 @@ int unit_file_disable( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, UnitFileChange **changes, unsigned *n_changes) { @@ -1543,7 +1543,7 @@ int unit_file_reenable( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -1820,7 +1820,7 @@ int unit_file_preset( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { diff --git a/src/shared/install.h b/src/shared/install.h index e87c57e48..5d57b1b02 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -73,13 +73,13 @@ typedef struct { char **required_by; } InstallInfo; -int unit_file_enable(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes); -int unit_file_disable(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], UnitFileChange **changes, unsigned *n_changes); -int unit_file_reenable(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes); -int unit_file_link(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes); -int unit_file_preset(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes); -int unit_file_mask(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], bool force, UnitFileChange **changes, unsigned *n_changes); -int unit_file_unmask(UnitFileScope scope, bool runtime, const char *root_dir, char *files[], UnitFileChange **changes, unsigned *n_changes); +int unit_file_enable(UnitFileScope scope, bool runtime, const char *root_dir, char **files, bool force, UnitFileChange **changes, unsigned *n_changes); +int unit_file_disable(UnitFileScope scope, bool runtime, const char *root_dir, char **files, UnitFileChange **changes, unsigned *n_changes); +int unit_file_reenable(UnitFileScope scope, bool runtime, const char *root_dir, char **files, bool force, UnitFileChange **changes, unsigned *n_changes); +int unit_file_link(UnitFileScope scope, bool runtime, const char *root_dir, char **files, bool force, UnitFileChange **changes, unsigned *n_changes); +int unit_file_preset(UnitFileScope scope, bool runtime, const char *root_dir, char **files, bool force, UnitFileChange **changes, unsigned *n_changes); +int unit_file_mask(UnitFileScope scope, bool runtime, const char *root_dir, char **files, bool force, UnitFileChange **changes, unsigned *n_changes); +int unit_file_unmask(UnitFileScope scope, bool runtime, const char *root_dir, char **files, UnitFileChange **changes, unsigned *n_changes); int unit_file_set_default(UnitFileScope scope, const char *root_dir, const char *file, bool force, UnitFileChange **changes, unsigned *n_changes); int unit_file_get_default(UnitFileScope scope, const char *root_dir, char **name); -- 2.30.2