diff options
| author | Paul Eggert | 2011-03-17 20:30:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-17 20:30:24 -0700 |
| commit | 401bf9b4708c19d3c86c888ce482014ca559a5b8 (patch) | |
| tree | d69e75d88c70f4c5d3da2501b4afec51cf51d563 /src/process.c | |
| parent | a3a6c54ec72118e8d22d2ecd608df5193c8926a3 (diff) | |
| download | emacs-401bf9b4708c19d3c86c888ce482014ca559a5b8.tar.gz emacs-401bf9b4708c19d3c86c888ce482014ca559a5b8.zip | |
process.c: Use socklen_t, not int, for socket lengths.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/process.c b/src/process.c index c9b420ab2ae..5a410c1e924 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -3467,7 +3467,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3467 | if (EQ (service, Qt)) | 3467 | if (EQ (service, Qt)) |
| 3468 | { | 3468 | { |
| 3469 | struct sockaddr_in sa1; | 3469 | struct sockaddr_in sa1; |
| 3470 | int len1 = sizeof (sa1); | 3470 | socklen_t len1 = sizeof (sa1); |
| 3471 | if (getsockname (s, (struct sockaddr *)&sa1, &len1) == 0) | 3471 | if (getsockname (s, (struct sockaddr *)&sa1, &len1) == 0) |
| 3472 | { | 3472 | { |
| 3473 | ((struct sockaddr_in *)(lres->ai_addr))->sin_port = sa1.sin_port; | 3473 | ((struct sockaddr_in *)(lres->ai_addr))->sin_port = sa1.sin_port; |
| @@ -3514,7 +3514,8 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3514 | /* Unlike most other syscalls connect() cannot be called | 3514 | /* Unlike most other syscalls connect() cannot be called |
| 3515 | again. (That would return EALREADY.) The proper way to | 3515 | again. (That would return EALREADY.) The proper way to |
| 3516 | wait for completion is select(). */ | 3516 | wait for completion is select(). */ |
| 3517 | int sc, len; | 3517 | int sc; |
| 3518 | socklen_t len; | ||
| 3518 | SELECT_TYPE fdset; | 3519 | SELECT_TYPE fdset; |
| 3519 | retry_select: | 3520 | retry_select: |
| 3520 | FD_ZERO (&fdset); | 3521 | FD_ZERO (&fdset); |
| @@ -3587,7 +3588,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3587 | if (!is_server) | 3588 | if (!is_server) |
| 3588 | { | 3589 | { |
| 3589 | struct sockaddr_in sa1; | 3590 | struct sockaddr_in sa1; |
| 3590 | int len1 = sizeof (sa1); | 3591 | socklen_t len1 = sizeof (sa1); |
| 3591 | if (getsockname (s, (struct sockaddr *)&sa1, &len1) == 0) | 3592 | if (getsockname (s, (struct sockaddr *)&sa1, &len1) == 0) |
| 3592 | contact = Fplist_put (contact, QClocal, | 3593 | contact = Fplist_put (contact, QClocal, |
| 3593 | conv_sockaddr_to_lisp ((struct sockaddr *)&sa1, len1)); | 3594 | conv_sockaddr_to_lisp ((struct sockaddr *)&sa1, len1)); |
| @@ -4192,7 +4193,7 @@ server_accept_connection (Lisp_Object server, int channel) | |||
| 4192 | struct sockaddr_un un; | 4193 | struct sockaddr_un un; |
| 4193 | #endif | 4194 | #endif |
| 4194 | } saddr; | 4195 | } saddr; |
| 4195 | int len = sizeof saddr; | 4196 | socklen_t len = sizeof saddr; |
| 4196 | 4197 | ||
| 4197 | s = accept (channel, &saddr.sa, &len); | 4198 | s = accept (channel, &saddr.sa, &len); |
| 4198 | 4199 | ||
| @@ -5059,7 +5060,7 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd, | |||
| 5059 | /* getsockopt(,,SO_ERROR,,) is said to hang on some systems. | 5060 | /* getsockopt(,,SO_ERROR,,) is said to hang on some systems. |
| 5060 | So only use it on systems where it is known to work. */ | 5061 | So only use it on systems where it is known to work. */ |
| 5061 | { | 5062 | { |
| 5062 | int xlen = sizeof (xerrno); | 5063 | socklen_t xlen = sizeof (xerrno); |
| 5063 | if (getsockopt (channel, SOL_SOCKET, SO_ERROR, &xerrno, &xlen)) | 5064 | if (getsockopt (channel, SOL_SOCKET, SO_ERROR, &xerrno, &xlen)) |
| 5064 | xerrno = errno; | 5065 | xerrno = errno; |
| 5065 | } | 5066 | } |
| @@ -5171,7 +5172,7 @@ read_process_output (Lisp_Object proc, register int channel) | |||
| 5171 | /* We have a working select, so proc_buffered_char is always -1. */ | 5172 | /* We have a working select, so proc_buffered_char is always -1. */ |
| 5172 | if (DATAGRAM_CHAN_P (channel)) | 5173 | if (DATAGRAM_CHAN_P (channel)) |
| 5173 | { | 5174 | { |
| 5174 | int len = datagram_address[channel].len; | 5175 | socklen_t len = datagram_address[channel].len; |
| 5175 | nbytes = recvfrom (channel, chars + carryover, readmax, | 5176 | nbytes = recvfrom (channel, chars + carryover, readmax, |
| 5176 | 0, datagram_address[channel].sa, &len); | 5177 | 0, datagram_address[channel].sa, &len); |
| 5177 | } | 5178 | } |