chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
46b1315
)
hostnamed: minor modernization
author
Lennart Poettering
<lennart@poettering.net>
Fri, 11 Jul 2014 13:31:49 +0000
(15:31 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 11 Jul 2014 13:35:22 +0000
(15:35 +0200)
src/hostname/hostnamed.c
patch
|
blob
|
history
diff --git
a/src/hostname/hostnamed.c
b/src/hostname/hostnamed.c
index a4849b3673a3ffd44e680983b548527af6f7b294..19ab500533696fb3d13a361218538a94ee8ed3a0 100644
(file)
--- a/
src/hostname/hostnamed.c
+++ b/
src/hostname/hostnamed.c
@@
-336,7
+336,8
@@
static int context_write_data_machine_info(Context *c) {
return r;
for (p = PROP_PRETTY_HOSTNAME; p <= PROP_DEPLOYMENT; p++) {
return r;
for (p = PROP_PRETTY_HOSTNAME; p <= PROP_DEPLOYMENT; p++) {
- char *t, **u;
+ _cleanup_free_ char *t = NULL;
+ char **u;
assert(name[p]);
assert(name[p]);
@@
-345,12
+346,11
@@
static int context_write_data_machine_info(Context *c) {
continue;
}
continue;
}
- if (asprintf(&t, "%s=%s", name[p], strempty(c->data[p])) < 0)
+ t = strjoin(name[p], "=", c->data[p], NULL);
+ if (!t)
return -ENOMEM;
u = strv_env_set(l, t);
return -ENOMEM;
u = strv_env_set(l, t);
- free(t);
-
if (!u)
return -ENOMEM;
if (!u)
return -ENOMEM;
@@
-359,7
+359,6
@@
static int context_write_data_machine_info(Context *c) {
}
if (strv_isempty(l)) {
}
if (strv_isempty(l)) {
-
if (unlink("/etc/machine-info") < 0)
return errno == ENOENT ? 0 : -errno;
if (unlink("/etc/machine-info") < 0)
return errno == ENOENT ? 0 : -errno;