Permalink
Browse files

Merge pull request #10 from sam/master

Fix gcc4.6 errors on -Wunused-but-set-variable
  • Loading branch information...
2 parents f8ba503 + 67301a2 commit dd2ff199295cdbab9f41b774c39aced4cce11f30 @evanmiller committed Jan 18, 2012
Showing with 2 additions and 5 deletions.
  1. +2 −3 ngx_http_zip_file.c
  2. +0 −2 ngx_http_zip_headers.c
View
@@ -223,7 +223,6 @@ ngx_http_zip_generate_pieces(ngx_http_request_t *r, ngx_http_zip_ctx_t *ctx)
#ifdef NGX_ZIP_HAVE_ICONV
if (ctx->unicode_path) {
size_t inlen = file->filename.len, outlen, outleft;
- size_t res;
u_char *p, *in;
//inbuf
@@ -243,8 +242,8 @@ ngx_http_zip_generate_pieces(ngx_http_request_t *r, ngx_http_zip_ctx_t *ctx)
iconv(iconv_cd, NULL, NULL, NULL, NULL);
//convert the string
- res = iconv(iconv_cd, (char **)&in, &inlen, (char **)&p, &outleft);
- //XXX if (res == (size_t)-1) { ? }
+ iconv(iconv_cd, (char **)&in, &inlen, (char **)&p, &outleft);
+ //XXX if (res == (size_t)-1) { ? }
file->filename.len = outlen - outleft;
@@ -196,10 +196,8 @@ ngx_http_zip_add_partial_content_range(ngx_http_request_t *r,
ngx_int_t
ngx_http_zip_strip_range_header(ngx_http_request_t *r)
{
- ngx_list_part_t *part;
ngx_table_elt_t *header;
- part = &r->headers_in.headers.part;
header = r->headers_in.range;
if (header) {

0 comments on commit dd2ff19

Please sign in to comment.