From: Zbigniew Jędrzejewski-Szmek Date: Tue, 8 Mar 2022 10:49:19 +0000 (+0100) Subject: shared/install-printf: drop now-unused install_path_printf() X-Git-Tag: v251-rc1~105 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cdd6bef9c940774d40046db9be41ea73cdb5d8e;p=thirdparty%2Fsystemd.git shared/install-printf: drop now-unused install_path_printf() --- diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c index 14553d8c554..9c121cbaf79 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -97,7 +97,7 @@ static int specifier_last_component(char specifier, const void *data, const char return 0; } -int install_full_printf_internal(const UnitFileInstallInfo *i, const char *format, size_t max_length, const char *root, char **ret) { +int install_name_printf(const UnitFileInstallInfo *i, const char *format, const char *root, char **ret) { /* This is similar to unit_name_printf() */ const Specifier table[] = { @@ -117,5 +117,5 @@ int install_full_printf_internal(const UnitFileInstallInfo *i, const char *forma assert(format); assert(ret); - return specifier_printf(format, max_length, table, root, i, ret); + return specifier_printf(format, UNIT_NAME_MAX, table, root, i, ret); } diff --git a/src/shared/install-printf.h b/src/shared/install-printf.h index af32acc2cad..5ca9406797a 100644 --- a/src/shared/install-printf.h +++ b/src/shared/install-printf.h @@ -4,11 +4,4 @@ #include "install.h" #include "unit-name.h" -int install_full_printf_internal(const UnitFileInstallInfo *i, const char *format, size_t max_length, const char *root, char **ret); - -static inline int install_name_printf(const UnitFileInstallInfo *i, const char *format, const char *root, char **ret) { - return install_full_printf_internal(i, format, UNIT_NAME_MAX, root, ret); -} -static inline int install_path_printf(const UnitFileInstallInfo *i, const char *format, const char *root, char **ret) { - return install_full_printf_internal(i, format, PATH_MAX-1, root, ret); -} +int install_name_printf(const UnitFileInstallInfo *i, const char *format, const char *root, char **ret);