diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-05-11 22:53:54 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-05-11 22:53:54 +0200 |
| commit | cab6235f748e365198a7939f23c87ab3b8f59b2e (patch) | |
| tree | fd4cb3d86febefc6b1fd69af0298a77ec598195b /src/shared/install-printf.c | |
| parent | b2c23da8cea1987a1a329f5a964d3299b7ca7890 (diff) | |
install: when exporting prefix InstallInfo to become UnitFileInstallInfo
All other types exported from install.h should be namespaces like this,
hence namespace InstallInfo the same way.
Also, remove external forward definition of UnitFileScope type.
Diffstat (limited to 'src/shared/install-printf.c')
| -rw-r--r-- | src/shared/install-printf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c index 7c25d36931..cbe984d2fb 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -28,7 +28,7 @@ #include "formats-util.h" static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) { - InstallInfo *i = userdata; + UnitFileInstallInfo *i = userdata; assert(i); @@ -36,7 +36,7 @@ static int specifier_prefix_and_instance(char specifier, void *data, void *userd } static int specifier_prefix(char specifier, void *data, void *userdata, char **ret) { - InstallInfo *i = userdata; + UnitFileInstallInfo *i = userdata; assert(i); @@ -44,7 +44,7 @@ static int specifier_prefix(char specifier, void *data, void *userdata, char **r } static int specifier_instance(char specifier, void *data, void *userdata, char **ret) { - InstallInfo *i = userdata; + UnitFileInstallInfo *i = userdata; char *instance; int r; @@ -65,7 +65,7 @@ static int specifier_instance(char specifier, void *data, void *userdata, char * } static int specifier_user_name(char specifier, void *data, void *userdata, char **ret) { - InstallInfo *i = userdata; + UnitFileInstallInfo *i = userdata; const char *username; _cleanup_free_ char *tmp = NULL; char *printed = NULL; @@ -102,7 +102,7 @@ static int specifier_user_name(char specifier, void *data, void *userdata, char } -int install_full_printf(InstallInfo *i, const char *format, char **ret) { +int install_full_printf(UnitFileInstallInfo *i, const char *format, char **ret) { /* This is similar to unit_full_printf() but does not support * anything path-related. |