mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-03 01:33:42 +00:00
server: Use socklen_t where appropriate.
This commit is contained in:
parent
3f807e7a1a
commit
9fdf7bc771
|
@ -537,7 +537,7 @@ static void master_socket_poll_event( struct fd *fd, int event )
|
||||||
else if (event & POLLIN)
|
else if (event & POLLIN)
|
||||||
{
|
{
|
||||||
struct sockaddr_un dummy;
|
struct sockaddr_un dummy;
|
||||||
unsigned int len = sizeof(dummy);
|
socklen_t len = sizeof(dummy);
|
||||||
int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len );
|
int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len );
|
||||||
if (client == -1) return;
|
if (client == -1) return;
|
||||||
fcntl( client, F_SETFL, O_NONBLOCK );
|
fcntl( client, F_SETFL, O_NONBLOCK );
|
||||||
|
|
|
@ -285,9 +285,9 @@ static void sock_wake_up( struct sock *sock )
|
||||||
|
|
||||||
static inline int sock_error( struct fd *fd )
|
static inline int sock_error( struct fd *fd )
|
||||||
{
|
{
|
||||||
unsigned int optval = 0, optlen;
|
unsigned int optval = 0;
|
||||||
|
socklen_t optlen = sizeof(optval);
|
||||||
|
|
||||||
optlen = sizeof(optval);
|
|
||||||
getsockopt( get_unix_fd(fd), SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen);
|
getsockopt( get_unix_fd(fd), SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen);
|
||||||
return optval;
|
return optval;
|
||||||
}
|
}
|
||||||
|
@ -667,7 +667,7 @@ static int accept_new_fd( struct sock *sock )
|
||||||
*/
|
*/
|
||||||
int acceptfd;
|
int acceptfd;
|
||||||
struct sockaddr saddr;
|
struct sockaddr saddr;
|
||||||
unsigned int slen = sizeof(saddr);
|
socklen_t slen = sizeof(saddr);
|
||||||
acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen);
|
acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen);
|
||||||
if (acceptfd == -1)
|
if (acceptfd == -1)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue