service: optionally, trie dbus name cycle to service cycle

[elogind.git] / util.c

diff --git a/util.c b/util.c
index 17ee09c1f7d23da9782c3db0b4432f505c7579d0..5f36819fa31f432181989130822d6f047c013da7 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1041,16 +1041,15 @@ char *bus_path_escape(const char *s) {
         return r;
 }
 
-char *bus_path_unescape(const char *s) {
+char *bus_path_unescape(const char *f) {
         char *r, *t;
-        const char *f;
 
-        assert(s);
+        assert(f);
 
-        if (!(r = new(char, strlen(s)+1)))
+        if (!(r = strdup(f)))
                 return NULL;
 
-        for (f = s, t = r; *f; f++) {
+        for (t = r; *f; f++) {
 
                 if (*f == '_') {
                         int a, b;