Mercurial > hg > nginx
changeset 1696:f5f124fbfa3b
delete useless variable
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Fri, 07 Dec 2007 20:57:38 +0000 |
| parents | 8c4532a48b0a |
| children | d6afb8723155 |
| files | src/http/modules/ngx_http_flv_module.c src/http/modules/ngx_http_static_module.c |
| diffstat | 2 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_flv_module.c +++ b/src/http/modules/ngx_http_flv_module.c @@ -63,7 +63,6 @@ ngx_http_flv_handler(ngx_http_request_t u_char *p, *last; off_t start, len; size_t root; - ngx_fd_t fd; ngx_int_t rc; ngx_uint_t level, i; ngx_str_t path; @@ -149,11 +148,9 @@ ngx_http_flv_handler(ngx_http_request_t return rc; } - fd = of.fd; - if (!of.is_file) { - if (ngx_close_file(fd) == NGX_FILE_ERROR) { + if (ngx_close_file(of.fd) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, ngx_close_file_n " \"%s\" failed", path.data); } @@ -235,7 +232,7 @@ ngx_http_flv_handler(ngx_http_request_t b->last_buf = 1; b->last_in_chain = 1; - b->file->fd = fd; + b->file->fd = of.fd; b->file->name = path; b->file->log = log;
--- a/src/http/modules/ngx_http_static_module.c +++ b/src/http/modules/ngx_http_static_module.c @@ -49,7 +49,6 @@ ngx_http_static_handler(ngx_http_request { u_char *last, *location; size_t root; - ngx_fd_t fd; ngx_str_t path; ngx_int_t rc; ngx_uint_t level; @@ -140,9 +139,7 @@ ngx_http_static_handler(ngx_http_request return rc; } - fd = of.fd; - - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d", fd); + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d", of.fd); if (of.is_dir) { @@ -230,7 +227,7 @@ ngx_http_static_handler(ngx_http_request b->last_buf = (r == r->main) ? 1: 0; b->last_in_chain = 1; - b->file->fd = fd; + b->file->fd = of.fd; b->file->name = path; b->file->log = log;