Zebediah Figura : server: Rename the "flags" field of struct poll_req to "mask".
Alexandre Julliard
julliard at winehq.org
Fri Dec 10 15:07:52 CST 2021
Module: wine
Branch: master
Commit: 06fdbd6edafa106e3ad09a309f1660534ec71021
URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fdbd6edafa106e3ad09a309f1660534ec71021
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Fri Dec 10 11:27:38 2021 -0600
server: Rename the "flags" field of struct poll_req to "mask".
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/sock.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/sock.c b/server/sock.c
index 8521e34ed7e..d674d2a8f84 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -128,7 +128,7 @@ struct poll_req
struct
{
struct sock *sock;
- int flags;
+ int mask;
} sockets[1];
};
@@ -862,13 +862,13 @@ static void complete_async_polls( struct sock *sock, int event, int error )
for (i = 0; i < req->count; ++i)
{
if (req->sockets[i].sock != sock) continue;
- if (!(req->sockets[i].flags & flags)) continue;
+ if (!(req->sockets[i].mask & flags)) continue;
if (debug_level)
fprintf( stderr, "completing poll for socket %p, wanted %#x got %#x\n",
- sock, req->sockets[i].flags, flags );
+ sock, req->sockets[i].mask, flags );
- req->output[i].flags = req->sockets[i].flags & flags;
+ req->output[i].flags = req->sockets[i].mask & flags;
req->output[i].status = sock_get_ntstatus( error );
complete_async_poll( req, STATUS_SUCCESS );
@@ -1220,7 +1220,7 @@ static int sock_get_poll_events( struct fd *fd )
{
if (req->sockets[i].sock != sock) continue;
- ev |= poll_flags_from_afd( sock, req->sockets[i].flags );
+ ev |= poll_flags_from_afd( sock, req->sockets[i].mask );
}
}
@@ -2936,7 +2936,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus
free( output );
return;
}
- req->sockets[i].flags = input[i].flags;
+ req->sockets[i].mask = input[i].flags;
}
req->exclusive = exclusive;
@@ -2954,7 +2954,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus
for (i = 0; i < count; ++i)
{
struct sock *sock = req->sockets[i].sock;
- int mask = req->sockets[i].flags;
+ int mask = req->sockets[i].mask;
int flags = poll_single_socket( sock, mask );
if (flags)
More information about the wine-cvs
mailing list