add username to runtime directory name in /tmp/

[pulseaudio] / polyp / socket-util.c

diff --git a/polyp/socket-util.c b/polyp/socket-util.c
index 96ea2c6076fabcb7bca8c95c578056dfcb7cc575..e0540179a195f2e1eac4fbeff125e1174c38340c 100644 (file)
--- a/polyp/socket-util.c
+++ b/polyp/socket-util.c
@@ -114,7 +114,7 @@ int pa_socket_tcp_low_delay(int fd) {
     ret = pa_socket_low_delay(fd);
     
     on = 1;
-/*
+
 #if defined(SOL_TCP) || defined(IPPROTO_TCP)
 #if defined(SOL_TCP)
     if (setsockopt(fd, SOL_TCP, TCP_NODELAY, &on, sizeof(on)) < 0)
@@ -123,7 +123,6 @@ int pa_socket_tcp_low_delay(int fd) {
 #endif
         ret = -1;
 #endif
-*/
 
 #if defined(IPTOS_LOWDELAY) && defined(IP_TOS) && (defined(SOL_IP) || \
        defined(IPPROTO_IP))
@@ -204,42 +203,6 @@ int pa_unix_socket_remove_stale(const char *fn) {
     return 0;
 }
 
-int pa_unix_socket_make_secure_dir(const char *fn) {
-    int ret = -1;
-    char *slash, *dir = pa_xstrdup(fn);
-    
-    if (!(slash = strrchr(dir, '/')))
-        goto finish;
-    *slash = 0;
-    
-    if (pa_make_secure_dir(dir) < 0)
-        goto finish;
-
-    ret = 0;
-    
-finish:
-    pa_xfree(dir);
-    return ret;
-}
-
-int pa_unix_socket_remove_secure_dir(const char *fn) {
-    int ret = -1;
-    char *slash, *dir = pa_xstrdup(fn);
-    
-    if (!(slash = strrchr(dir, '/')))
-        goto finish;
-    *slash = 0;
-
-    if (rmdir(dir) < 0)
-        goto finish;
-    
-    ret = 0;
-    
-finish:
-    pa_xfree(dir);
-    return ret;
-}
-
 struct sockaddr *pa_resolve_server(const char *server, size_t *len, uint16_t nport) {
     struct sockaddr *sa;
     struct addrinfo hints, *result = NULL;