diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-26 17:30:56 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-27 13:25:55 +0100 |
| commit | 5f311f8c0e51e2f13773823feb6a71f7c6f2838c (patch) | |
| tree | 6edfc648016e7000715e11c1ede94fde32e88d82 /src/core/socket.c | |
| parent | e4e73a632524c382139034d4271f53b6089ab4cb (diff) | |
util: remove path_get_parent(), in favour of dirname_malloc()
We don't need two functions that do essentialy the same, hence drop
path_get_parent(), and stick to dirname_malloc(), but move it to
path-util.[ch].
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 49cef210dc..8ea7bd9af4 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1169,9 +1169,9 @@ static int usbffs_dispatch_eps(SocketPort *p) { _cleanup_free_ char *path = NULL; int r, i, n, k; - r = path_get_parent(p->path, &path); - if (r < 0) - return r; + path = dirname_malloc(p->path); + if (!path) + return -ENOMEM; r = scandir(path, &ent, usbffs_select_ep, alphasort); if (r < 0) |