9pmount: Don't init variables if they are unconditionally assigned later

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2016-09-05 12:22:12 +01:00
parent 3c30271f3c
commit 839a65c0bd

View File

@ -66,8 +66,8 @@ static int handle(int fd, char *tag, char *path)
static int create_listening_socket(GUID serviceid) static int create_listening_socket(GUID serviceid)
{ {
int lsock = -1;
SOCKADDR_HV sa; SOCKADDR_HV sa;
int lsock;
int res; int res;
lsock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW); lsock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
@ -92,8 +92,8 @@ static int create_listening_socket(GUID serviceid)
static int connect_socket(GUID serviceid) static int connect_socket(GUID serviceid)
{ {
int sock = -1;
SOCKADDR_HV sa; SOCKADDR_HV sa;
int sock;
int res; int res;
sock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW); sock = socket(AF_HYPERV, SOCK_STREAM, HV_PROTOCOL_RAW);
@ -114,9 +114,9 @@ static int connect_socket(GUID serviceid)
static int accept_socket(int lsock) static int accept_socket(int lsock)
{ {
int csock = -1;
SOCKADDR_HV sac; SOCKADDR_HV sac;
socklen_t socklen = sizeof(sac); socklen_t socklen = sizeof(sac);
int csock;
csock = accept(lsock, (struct sockaddr *)&sac, &socklen); csock = accept(lsock, (struct sockaddr *)&sac, &socklen);
if (csock == -1) if (csock == -1)
@ -217,7 +217,7 @@ int main(int argc, char **argv)
openlog(argv[0], LOG_CONS | LOG_NDELAY | LOG_PERROR, LOG_DAEMON); openlog(argv[0], LOG_CONS | LOG_NDELAY | LOG_PERROR, LOG_DAEMON);
for (;;) { for (;;) {
int lsocket; int lsocket;
int sock = -1; int sock;
int r; int r;
if (mode == LISTEN) { if (mode == LISTEN) {