commit e60ccbe

Michael Forney  ·  2016-05-21 19:21:50 +0000 UTC
parent 191d928
xserver: Remove unused path_size variable
1 files changed,  +5, -6
+5, -6
 1@@ -57,7 +57,7 @@ static struct {
 2 struct swc_xserver swc_xserver;
 3 
 4 static int
 5-open_socket(struct sockaddr_un *addr, size_t path_size)
 6+open_socket(struct sockaddr_un *addr)
 7 {
 8 	int fd;
 9 
10@@ -91,7 +91,6 @@ open_display(void)
11 	char lock_name[64], pid[12];
12 	int lock_fd;
13 	struct sockaddr_un addr = {.sun_family = AF_LOCAL};
14-	size_t path_size;
15 
16 	xserver.display = 0;
17 
18@@ -149,14 +148,14 @@ begin:
19 
20 	/* Bind to abstract socket */
21 	addr.sun_path[0] = '\0';
22-	path_size = snprintf(addr.sun_path + 1, sizeof addr.sun_path - 1, SOCKET_FMT, xserver.display);
23-	if ((xserver.abstract_fd = open_socket(&addr, path_size)) < 0)
24+	snprintf(addr.sun_path + 1, sizeof(addr.sun_path) - 1, SOCKET_FMT, xserver.display);
25+	if ((xserver.abstract_fd = open_socket(&addr)) < 0)
26 		goto retry1;
27 
28 	/* Bind to unix socket */
29 	mkdir(SOCKET_DIR, 0777);
30-	path_size = snprintf(addr.sun_path, sizeof addr.sun_path, SOCKET_FMT, xserver.display);
31-	if ((xserver.unix_fd = open_socket(&addr, path_size)) < 0)
32+	snprintf(addr.sun_path, sizeof(addr.sun_path), SOCKET_FMT, xserver.display);
33+	if ((xserver.unix_fd = open_socket(&addr)) < 0)
34 		goto retry2;
35 
36 	snprintf(xserver.display_name, sizeof xserver.display_name, ":%d", xserver.display);