X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Finstall-printf.c;h=7c25d369319982cbd0c4bffd2b35d55cbfb30f36;hb=0eb4b7f2e7ed1dda0511b440ec002c668de99fb9;hp=1ee1243f4d191c63e0acda1be7c06682db04efc3;hpb=19f6d710772305610b928bc2678b9d77fe11e770;p=elogind.git
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 1ee1243f4..7c25d3693 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -19,40 +19,28 @@
along with systemd; If not, see .
***/
-#include
#include
#include "specifier.h"
#include "unit-name.h"
#include "util.h"
#include "install-printf.h"
+#include "formats-util.h"
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) {
@@ -103,7 +91,7 @@ static int specifier_user_name(char specifier, void *data, void *userdata, char
if (r < 0)
return r;
- if (asprintf(&printed, "%d", uid) < 0)
+ if (asprintf(&printed, UID_FMT, uid) < 0)
return -ENOMEM;
break;
}}