Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
438dae52
Commit
438dae52
authored
Aug 30, 2016
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
70dd64cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
request.c
server/request.c
+3
-3
sock.c
server/sock.c
+2
-2
No files found.
server/request.c
View file @
438dae52
...
@@ -241,7 +241,7 @@ void write_reply( struct thread *thread )
...
@@ -241,7 +241,7 @@ void write_reply( struct thread *thread )
}
}
if
(
errno
==
EPIPE
)
if
(
errno
==
EPIPE
)
kill_thread
(
thread
,
0
);
/* normal death */
kill_thread
(
thread
,
0
);
/* normal death */
else
if
(
errno
!=
EWOULDBLOCK
&&
errno
!=
EAGAIN
)
else
if
(
errno
!=
EWOULDBLOCK
&&
(
EWOULDBLOCK
==
EAGAIN
||
errno
!=
EAGAIN
)
)
fatal_protocol_error
(
thread
,
"reply write: %s
\n
"
,
strerror
(
errno
));
fatal_protocol_error
(
thread
,
"reply write: %s
\n
"
,
strerror
(
errno
));
}
}
...
@@ -368,7 +368,7 @@ error:
...
@@ -368,7 +368,7 @@ error:
kill_thread
(
thread
,
0
);
kill_thread
(
thread
,
0
);
else
if
(
ret
>
0
)
else
if
(
ret
>
0
)
fatal_protocol_error
(
thread
,
"partial read %d
\n
"
,
ret
);
fatal_protocol_error
(
thread
,
"partial read %d
\n
"
,
ret
);
else
if
(
errno
!=
EWOULDBLOCK
&&
errno
!=
EAGAIN
)
else
if
(
errno
!=
EWOULDBLOCK
&&
(
EWOULDBLOCK
==
EAGAIN
||
errno
!=
EAGAIN
)
)
fatal_protocol_error
(
thread
,
"read: %s
\n
"
,
strerror
(
errno
));
fatal_protocol_error
(
thread
,
"read: %s
\n
"
,
strerror
(
errno
));
}
}
...
@@ -449,7 +449,7 @@ int receive_fd( struct process *process )
...
@@ -449,7 +449,7 @@ int receive_fd( struct process *process )
}
}
else
else
{
{
if
(
errno
!=
EWOULDBLOCK
&&
errno
!=
EAGAIN
)
if
(
errno
!=
EWOULDBLOCK
&&
(
EWOULDBLOCK
==
EAGAIN
||
errno
!=
EAGAIN
)
)
{
{
fprintf
(
stderr
,
"Protocol error: process %04x: "
,
process
->
id
);
fprintf
(
stderr
,
"Protocol error: process %04x: "
,
process
->
id
);
perror
(
"recvmsg"
);
perror
(
"recvmsg"
);
...
...
server/sock.c
View file @
438dae52
...
@@ -1075,8 +1075,8 @@ static void ifchange_poll_event( struct fd *fd, int event )
...
@@ -1075,8 +1075,8 @@ static void ifchange_poll_event( struct fd *fd, int event )
r
=
recv
(
get_unix_fd
(
fd
),
buffer
,
sizeof
(
buffer
),
MSG_DONTWAIT
);
r
=
recv
(
get_unix_fd
(
fd
),
buffer
,
sizeof
(
buffer
),
MSG_DONTWAIT
);
if
(
r
<
0
)
if
(
r
<
0
)
{
{
if
(
errno
==
EWOULDBLOCK
||
errno
==
EAGAIN
)
if
(
errno
==
EWOULDBLOCK
||
(
EWOULDBLOCK
!=
EAGAIN
&&
errno
==
EAGAIN
)
)
return
;
/* retry when poll() says the socket is ready */
return
;
/* retry when poll() says the socket is ready */
status
=
sock_get_ntstatus
(
errno
);
status
=
sock_get_ntstatus
(
errno
);
}
}
else
if
(
r
>
0
)
else
if
(
r
>
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment