rename variable
Igor Sysoev
15 years ago
| 20 | 20 | void |
| 21 | 21 | ngx_event_accept(ngx_event_t *ev) |
| 22 | 22 | { |
| 23 | socklen_t sl; | |
| 23 | socklen_t socklen; | |
| 24 | 24 | ngx_err_t err; |
| 25 | 25 | ngx_log_t *log; |
| 26 | 26 | ngx_socket_t s; |
| 47 | 47 | "accept on %V, ready: %d", &ls->addr_text, ev->available); |
| 48 | 48 | |
| 49 | 49 | do { |
| 50 | sl = NGX_SOCKLEN; | |
| 51 | ||
| 52 | s = accept(lc->fd, (struct sockaddr *) sa, &sl); | |
| 50 | socklen = NGX_SOCKLEN; | |
| 51 | ||
| 52 | s = accept(lc->fd, (struct sockaddr *) sa, &socklen); | |
| 53 | 53 | |
| 54 | 54 | if (s == -1) { |
| 55 | 55 | err = ngx_socket_errno; |
| 103 | 103 | return; |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | c->sockaddr = ngx_palloc(c->pool, sl); | |
| 106 | c->sockaddr = ngx_palloc(c->pool, socklen); | |
| 107 | 107 | if (c->sockaddr == NULL) { |
| 108 | 108 | ngx_close_accepted_connection(c); |
| 109 | 109 | return; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | ngx_memcpy(c->sockaddr, sa, sl); | |
| 112 | ngx_memcpy(c->sockaddr, sa, socklen); | |
| 113 | 113 | |
| 114 | 114 | log = ngx_palloc(c->pool, sizeof(ngx_log_t)); |
| 115 | 115 | if (log == NULL) { |
| 151 | 151 | c->pool->log = log; |
| 152 | 152 | |
| 153 | 153 | c->listening = ls; |
| 154 | c->socklen = sl; | |
| 154 | c->socklen = socklen; | |
| 155 | 155 | |
| 156 | 156 | c->unexpected_eof = 1; |
| 157 | 157 | |