From 46091a9237f17f4295dca7140d8d70b4fce8b357 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 4 Aug 2004 16:39:30 +0000
Subject: 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
---
 polyp/socket-server.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'polyp/socket-server.c')

diff --git a/polyp/socket-server.c b/polyp/socket-server.c
index 0f497377..5f332f0c 100644
--- a/polyp/socket-server.c
+++ b/polyp/socket-server.c
@@ -37,6 +37,7 @@
 
 #include "socket-server.h"
 #include "socket-util.h"
+#include "xmalloc.h"
 
 struct pa_socket_server {
     int fd;
@@ -81,8 +82,7 @@ struct pa_socket_server* pa_socket_server_new(struct pa_mainloop_api *m, int fd)
     struct pa_socket_server *s;
     assert(m && fd >= 0);
     
-    s = malloc(sizeof(struct pa_socket_server));
-    assert(s);
+    s = pa_xmalloc(sizeof(struct pa_socket_server));
     s->fd = fd;
     s->filename = NULL;
     s->on_connection = NULL;
@@ -128,9 +128,7 @@ struct pa_socket_server* pa_socket_server_new_unix(struct pa_mainloop_api *m, co
     s = pa_socket_server_new(m, fd);
     assert(s);
 
-    s->filename = strdup(filename);
-    assert(s->filename);
-
+    s->filename = pa_xstrdup(filename);
     s->type = SOCKET_SERVER_UNIX;
     
     return s;
@@ -192,13 +190,11 @@ void pa_socket_server_free(struct pa_socket_server*s) {
 
     if (s->filename) {
         unlink(s->filename);
-        free(s->filename);
+        pa_xfree(s->filename);
     }
 
-    
     s->mainloop->cancel_io(s->mainloop, s->mainloop_source);
-    
-    free(s);
+    pa_xfree(s);
 }
 
 void pa_socket_server_set_callback(struct pa_socket_server*s, void (*on_connection)(struct pa_socket_server*s, struct pa_iochannel *io, void *userdata), void *userdata) {
-- 
cgit