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
(from parent 1:
8fe12d8
)
install: don't override caller's parameter
author
Lennart Poettering
<lennart@poettering.net>
Fri, 8 Nov 2013 12:54:18 +0000
(13:54 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 8 Nov 2013 13:07:27 +0000
(14:07 +0100)
src/shared/install.c
patch
|
blob
|
history
diff --git
a/src/shared/install.c
b/src/shared/install.c
index 987b36d40b4eba187dc2e11d435d10be3344b1c9..cfd4a5af8acad9f038ed4b2b4473cd74f93ee0d7 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-1618,6
+1618,7
@@
int unit_file_get_default(
STRV_FOREACH(p, paths.unit_path) {
_cleanup_free_ char *path = NULL, *tmp = NULL;
+ char *n;
if (isempty(root_dir))
path = strappend(*p, "/default.target");
@@
-1630,13
+1631,14
@@
int unit_file_get_default(
r = readlink_malloc(path, &tmp);
if (r == -ENOENT)
continue;
-
else
if (r < 0)
+ if (r < 0)
return r;
-
*name
= strdup(path_get_file_name(tmp));
- if (!
*name
)
+
n
= strdup(path_get_file_name(tmp));
+ if (!
n
)
return -ENOMEM;
+ *name = n;
return 0;
}