Commit 64d51869 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

whitespace cleanup

empty lines and trailing whitespace
parent e5b4532a
...@@ -183,6 +183,7 @@ from the copyright holders. ...@@ -183,6 +183,7 @@ from the copyright holders.
#ifndef BACKLOG #ifndef BACKLOG
#define BACKLOG MIN_BACKLOG #define BACKLOG MIN_BACKLOG
#endif #endif
/* /*
* This is the Socket implementation of the X Transport service layer * This is the Socket implementation of the X Transport service layer
* *
...@@ -1101,6 +1102,7 @@ TRANS(SocketOpenCOTSClientBase) (char *transname, char *protocol, ...@@ -1101,6 +1102,7 @@ TRANS(SocketOpenCOTSClientBase) (char *transname, char *protocol,
i, Sockettrans2devtab[i].devcotsname)) != NULL) i, Sockettrans2devtab[i].devcotsname)) != NULL)
break; break;
} }
}
if (i < 0) { if (i < 0) {
if (i == -1) if (i == -1)
PRMSG (1,"SocketOpenCOTSClient: Unable to open socket for %s\n", PRMSG (1,"SocketOpenCOTSClient: Unable to open socket for %s\n",
...@@ -1776,6 +1778,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port, ...@@ -1776,6 +1778,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port,
return 0; return 0;
} }
static int static int
TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
...@@ -1990,7 +1993,6 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) ...@@ -1990,7 +1993,6 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
return NULL; return NULL;
} }
/* /*
* if the socket is abstract, we already modified the address to have a * if the socket is abstract, we already modified the address to have a
* @ instead of the initial NUL, so no need to do that again here. * @ instead of the initial NUL, so no need to do that again here.
...@@ -2280,8 +2282,10 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port) ...@@ -2280,8 +2282,10 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port)
ESET(EPROTOTYPE); ESET(EPROTOTYPE);
return TRANS_CONNECT_FAILED; return TRANS_CONNECT_FAILED;
} }
memcpy ((char *) &sockname.sin_addr, (char *) hostp->h_addr, memcpy ((char *) &sockname.sin_addr, (char *) hostp->h_addr,
sizeof (sockname.sin_addr)); sizeof (sockname.sin_addr));
} else { } else {
sockname.sin_addr.s_addr = tmpaddr; sockname.sin_addr.s_addr = tmpaddr;
} }
...@@ -2578,8 +2582,6 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port) ...@@ -2578,8 +2582,6 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
abstract = ciptr->transptr->flags & TRANS_ABSTRACT; abstract = ciptr->transptr->flags & TRANS_ABSTRACT;
#endif #endif
PRMSG (2,"SocketUNIXConnect(%d,%s,%s)\n", ciptr->fd, host, port); PRMSG (2,"SocketUNIXConnect(%d,%s,%s)\n", ciptr->fd, host, port);
/* /*
...@@ -3037,7 +3039,6 @@ TRANS(SocketINETClose) (XtransConnInfo ciptr) ...@@ -3037,7 +3039,6 @@ TRANS(SocketINETClose) (XtransConnInfo ciptr)
#ifdef UNIXCONN #ifdef UNIXCONN
static int static int
TRANS(SocketUNIXClose) (XtransConnInfo ciptr) TRANS(SocketUNIXClose) (XtransConnInfo ciptr)
{ {
/* /*
* If this is the server side, then once the socket is closed, * If this is the server side, then once the socket is closed,
......
...@@ -165,7 +165,7 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp) ...@@ -165,7 +165,7 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp)
*familyp=FamilyLocal; *familyp=FamilyLocal;
break; break;
} }
#endif /* defined(UNIXCONN) || defined(LOCALCONN)*/ #endif /* defined(UNIXCONN) || defined(LOCALCONN) */
#if (defined(__SCO__) || defined(__UNIXWARE__)) && defined(LOCALCONN) #if (defined(__SCO__) || defined(__UNIXWARE__)) && defined(LOCALCONN)
case 0: case 0:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment