chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libsystemd: Don't use "class" in public headers
[elogind.git]
/
src
/
shared
/
unit-name.c
diff --git
a/src/shared/unit-name.c
b/src/shared/unit-name.c
index 2924c473df4674a28691ed018689ccc8400532be..6c167b4331d995a9d9bc8b054611d8d905632859 100644
(file)
--- a/
src/shared/unit-name.c
+++ b/
src/shared/unit-name.c
@@
-294,7
+294,7
@@
char *unit_name_unescape(const char *f) {
}
char *unit_name_path_escape(const char *f) {
}
char *unit_name_path_escape(const char *f) {
-
char *p, *e
;
+
_cleanup_free_ char *p
;
assert(f);
assert(f);
@@
-304,15
+304,10
@@
char *unit_name_path_escape(const char *f) {
path_kill_slashes(p);
path_kill_slashes(p);
- if (streq(p, "/") || streq(p, "")) {
- free(p);
+ if (streq(p, "/") || streq(p, ""))
return strdup("-");
return strdup("-");
- }
-
- e = unit_name_escape(p[0] == '/' ? p + 1 : p);
- free(p);
- return
e
;
+ return
unit_name_escape(p[0] == '/' ? p + 1 : p)
;
}
char *unit_name_path_unescape(const char *f) {
}
char *unit_name_path_unescape(const char *f) {
@@
-410,7
+405,7
@@
char *unit_name_template(const char *f) {
}
char *unit_name_from_path(const char *path, const char *suffix) {
}
char *unit_name_from_path(const char *path, const char *suffix) {
-
char *p, *r
;
+
_cleanup_free_ char *p = NULL
;
assert(path);
assert(suffix);
assert(path);
assert(suffix);
@@
-419,14
+414,11
@@
char *unit_name_from_path(const char *path, const char *suffix) {
if (!p)
return NULL;
if (!p)
return NULL;
- r = strappend(p, suffix);
- free(p);
-
- return r;
+ return strappend(p, suffix);
}
char *unit_name_from_path_instance(const char *prefix, const char *path, const char *suffix) {
}
char *unit_name_from_path_instance(const char *prefix, const char *path, const char *suffix) {
-
char *p, *r
;
+
_cleanup_free_ char *p = NULL
;
assert(prefix);
assert(path);
assert(prefix);
assert(path);
@@
-436,10
+428,7
@@
char *unit_name_from_path_instance(const char *prefix, const char *path, const c
if (!p)
return NULL;
if (!p)
return NULL;
- r = strjoin(prefix, "@", p, suffix, NULL);
- free(p);
-
- return r;
+ return strjoin(prefix, "@", p, suffix, NULL);
}
char *unit_name_to_path(const char *name) {
}
char *unit_name_to_path(const char *name) {
@@
-504,7
+493,7
@@
char *unit_name_mangle(const char *name, enum unit_name_mangle allow_globs) {
/* We'll only escape the obvious characters here, to play
* safe. */
/* We'll only escape the obvious characters here, to play
* safe. */
- r = new(char, strlen(name) * 4 +
1 + sizeof(".service")-
1);
+ r = new(char, strlen(name) * 4 +
strlen(".service") +
1);
if (!r)
return NULL;
if (!r)
return NULL;