Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jackie Jiang
wine
Commits
9fdf7bc7
Commit
9fdf7bc7
authored
12 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
server: Use socklen_t where appropriate.
parent
3f807e7a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
server/request.c
+1
-1
1 addition, 1 deletion
server/request.c
server/sock.c
+3
-3
3 additions, 3 deletions
server/sock.c
with
4 additions
and
4 deletions
server/request.c
+
1
−
1
View file @
9fdf7bc7
...
...
@@ -537,7 +537,7 @@ static void master_socket_poll_event( struct fd *fd, int event )
else
if
(
event
&
POLLIN
)
{
struct
sockaddr_un
dummy
;
unsigned
in
t
len
=
sizeof
(
dummy
);
socklen_
t
len
=
sizeof
(
dummy
);
int
client
=
accept
(
get_unix_fd
(
master_socket
->
fd
),
(
struct
sockaddr
*
)
&
dummy
,
&
len
);
if
(
client
==
-
1
)
return
;
fcntl
(
client
,
F_SETFL
,
O_NONBLOCK
);
...
...
This diff is collapsed.
Click to expand it.
server/sock.c
+
3
−
3
View file @
9fdf7bc7
...
...
@@ -285,9 +285,9 @@ static void sock_wake_up( struct sock *sock )
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
);
return
optval
;
}
...
...
@@ -667,7 +667,7 @@ static int accept_new_fd( struct sock *sock )
*/
int
acceptfd
;
struct
sockaddr
saddr
;
unsigned
in
t
slen
=
sizeof
(
saddr
);
socklen_
t
slen
=
sizeof
(
saddr
);
acceptfd
=
accept
(
get_unix_fd
(
sock
->
fd
),
&
saddr
,
&
slen
);
if
(
acceptfd
==
-
1
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment