commit bf9647b

xserver: {abstract,unix}_socket -> {abstract,unix}_fd

 1@@ -52,7 +52,7 @@ static struct
 2     struct wl_resource * resource;
 3     int display;
 4     char display_name[16];
 5-    int abstract_socket, unix_socket;
 6+    int abstract_fd, unix_fd;
 7 } xserver;
 8 
 9 static char * xserver_command[] = {
10@@ -110,7 +110,7 @@ static bool open_display()
11     goto begin;
12 
13   retry2:
14-    close(xserver.abstract_socket);
15+    close(xserver.abstract_fd);
16   retry1:
17     unlink(lock_name);
18   retry0:
19@@ -143,14 +143,14 @@ static bool open_display()
20     addr.sun_path[0] = '\0';
21     path_size = snprintf(addr.sun_path + 1, sizeof addr.sun_path - 1,
22                          SOCKET_FMT, xserver.display);
23-    if ((xserver.abstract_socket = open_socket(&addr, path_size)) < 0)
24+    if ((xserver.abstract_fd = open_socket(&addr, path_size)) < 0)
25         goto retry1;
26 
27     /* Bind to unix socket */
28     mkdir(SOCKET_DIR, 0777);
29     path_size = snprintf(addr.sun_path, sizeof addr.sun_path,
30                          SOCKET_FMT, xserver.display);
31-    if ((xserver.unix_socket = open_socket(&addr, path_size)) < 0)
32+    if ((xserver.unix_fd = open_socket(&addr, path_size)) < 0)
33         goto retry2;
34 
35     snprintf(xserver.display_name, sizeof xserver.display_name,
36@@ -164,8 +164,8 @@ static void close_display()
37 {
38     char path[64];
39 
40-    close(xserver.abstract_socket);
41-    close(xserver.unix_socket);
42+    close(xserver.abstract_fd);
43+    close(xserver.unix_fd);
44 
45     snprintf(path, sizeof path, SOCKET_FMT, xserver.display);
46     unlink(path);
47@@ -203,8 +203,8 @@ static void bind_xserver(struct wl_client * client, void * data,
48     wl_client_flush(xserver.client);
49     xwm_initialize(sv[0]);
50 
51-    xserver_send_listen_socket(xserver.resource, xserver.abstract_socket);
52-    xserver_send_listen_socket(xserver.resource, xserver.unix_socket);
53+    xserver_send_listen_socket(xserver.resource, xserver.abstract_fd);
54+    xserver_send_listen_socket(xserver.resource, xserver.unix_fd);
55 }
56 
57 static bool start_xserver()