diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-08-04 16:39:30 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-08-04 16:39:30 +0000 |
commit | 46091a9237f17f4295dca7140d8d70b4fce8b357 (patch) | |
tree | 1c600cd6e1801586abfb66d767f2cd96e15c819c /polyp/socket-util.c | |
parent | 24291aff27c671c11619684cb10d3b36fdf87c0d (diff) |
introduce pa_xmalloc() and friends
implement module auto loading
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@103 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/socket-util.c')
-rw-r--r-- | polyp/socket-util.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/polyp/socket-util.c b/polyp/socket-util.c index e0a3c28d..904381b7 100644 --- a/polyp/socket-util.c +++ b/polyp/socket-util.c @@ -40,6 +40,7 @@ #include "socket-util.h" #include "util.h" +#include "xmalloc.h" void pa_socket_peer_to_string(int fd, char *c, size_t l) { struct stat st; @@ -179,8 +180,7 @@ int pa_unix_socket_remove_stale(const char *fn) { int pa_unix_socket_make_secure_dir(const char *fn) { int ret = -1; - char *slash, *dir = strdup(fn); - assert(dir); + char *slash, *dir = pa_xstrdup(fn); if (!(slash = strrchr(dir, '/'))) goto finish; @@ -192,14 +192,13 @@ int pa_unix_socket_make_secure_dir(const char *fn) { ret = 0; finish: - free(dir); + pa_xfree(dir); return ret; } int pa_unix_socket_remove_secure_dir(const char *fn) { int ret = -1; - char *slash, *dir = strdup(fn); - assert(dir); + char *slash, *dir = pa_xstrdup(fn); if (!(slash = strrchr(dir, '/'))) goto finish; @@ -211,6 +210,6 @@ int pa_unix_socket_remove_secure_dir(const char *fn) { ret = 0; finish: - free(dir); + pa_xfree(dir); return ret; } |