X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Finstall-printf.c;h=7c25d369319982cbd0c4bffd2b35d55cbfb30f36;hp=999664942477de365530978e6b9b09f587405b2f;hb=0eb4b7f2e7ed1dda0511b440ec002c668de99fb9;hpb=3a296a5fe6c06deb497b09ab29b8363761b2885d diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c index 999664942..7c25d3693 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -29,30 +29,18 @@ static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) { InstallInfo *i = userdata; - char *n; assert(i); - n = unit_name_to_prefix_and_instance(i->name); - if (!n) - return -ENOMEM; - - *ret = n; - return 0; + return unit_name_to_prefix_and_instance(i->name, ret); } static int specifier_prefix(char specifier, void *data, void *userdata, char **ret) { InstallInfo *i = userdata; - char *n; assert(i); - n = unit_name_to_prefix(i->name); - if (!n) - return -ENOMEM; - - *ret = n; - return 0; + return unit_name_to_prefix(i->name, ret); } static int specifier_instance(char specifier, void *data, void *userdata, char **ret) {