chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix cgroups-agent match for kdbus
[elogind.git]
/
src
/
core
/
unit-printf.c
diff --git
a/src/core/unit-printf.c
b/src/core/unit-printf.c
index d16d856b516aa5e36bd84831a42ff45fbc801c5b..7736899a35ae9f0b8e49c232233ea98534d6dd2d 100644
(file)
--- a/
src/core/unit-printf.c
+++ b/
src/core/unit-printf.c
@@
-19,16
+19,13
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include "systemd/sd-id128.h"
#include "unit.h"
#include "specifier.h"
#include "unit.h"
#include "specifier.h"
-#include "path-util.h"
#include "strv.h"
#include "unit-name.h"
#include "unit-printf.h"
#include "macro.h"
#include "cgroup-util.h"
#include "strv.h"
#include "unit-name.h"
#include "unit-printf.h"
#include "macro.h"
#include "cgroup-util.h"
-#include "special.h"
static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
Unit *u = userdata;
static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
Unit *u = userdata;
@@
-182,7
+179,7
@@
static int specifier_user_name(char specifier, void *data, void *userdata, char
char *printed = NULL;
Unit *u = userdata;
ExecContext *c;
char *printed = NULL;
Unit *u = userdata;
ExecContext *c;
- int r;
+ int r
= 0
;
assert(u);
assert(u);
@@
-208,7
+205,7
@@
static int specifier_user_name(char specifier, void *data, void *userdata, char
if (r < 0)
return -ENODATA;
if (r < 0)
return -ENODATA;
-
asprintf(&printed, "%lu", (unsigned long)
uid);
+
r = asprintf(&printed, UID_FMT,
uid);
}
}
}
}
@@
-231,10
+228,10
@@
static int specifier_user_name(char specifier, void *data, void *userdata, char
if (specifier == 'u')
printed = strdup(username);
else
if (specifier == 'u')
printed = strdup(username);
else
-
asprintf(&printed, "%lu", (unsigned long)
uid);
+
r = asprintf(&printed, UID_FMT,
uid);
}
}
- if (!printed)
+ if (
r < 0 ||
!printed)
return -ENOMEM;
*ret = printed;
return -ENOMEM;
*ret = printed;