Mercurial > hg > nginx-quic
comparison src/http/ngx_http_request_body.c @ 5359:2fda9065d0f4
Win32: Borland C compatibility fixes.
Several false positive warnings silenced, notably W8012 "Comparing
signed and unsigned" (due to u_short values promoted to int), and
W8072 "Suspicious pointer arithmetic" (due to large type values added
to pointers).
With this patch, it's now again possible to compile nginx using bcc32,
with options we normally compile on win32 minus ipv6 and ssl.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 04 Sep 2013 20:48:23 +0400 |
parents | ea2ba6dbe361 |
children | cbb9a6c7493c |
comparison
equal
deleted
inserted
replaced
5358:670ceaba03d8 | 5359:2fda9065d0f4 |
---|---|
712 /* a chunk has been parsed successfully */ | 712 /* a chunk has been parsed successfully */ |
713 | 713 |
714 size = b->last - b->pos; | 714 size = b->last - b->pos; |
715 | 715 |
716 if ((off_t) size > rb->chunked->size) { | 716 if ((off_t) size > rb->chunked->size) { |
717 b->pos += rb->chunked->size; | 717 b->pos += (size_t) rb->chunked->size; |
718 rb->chunked->size = 0; | 718 rb->chunked->size = 0; |
719 | 719 |
720 } else { | 720 } else { |
721 rb->chunked->size -= size; | 721 rb->chunked->size -= size; |
722 b->pos = b->last; | 722 b->pos = b->last; |
751 | 751 |
752 } else { | 752 } else { |
753 size = b->last - b->pos; | 753 size = b->last - b->pos; |
754 | 754 |
755 if ((off_t) size > r->headers_in.content_length_n) { | 755 if ((off_t) size > r->headers_in.content_length_n) { |
756 b->pos += r->headers_in.content_length_n; | 756 b->pos += (size_t) r->headers_in.content_length_n; |
757 r->headers_in.content_length_n = 0; | 757 r->headers_in.content_length_n = 0; |
758 | 758 |
759 } else { | 759 } else { |
760 b->pos = b->last; | 760 b->pos = b->last; |
761 r->headers_in.content_length_n -= size; | 761 r->headers_in.content_length_n -= size; |
864 if ((off_t) size < rb->rest) { | 864 if ((off_t) size < rb->rest) { |
865 cl->buf->pos = cl->buf->last; | 865 cl->buf->pos = cl->buf->last; |
866 rb->rest -= size; | 866 rb->rest -= size; |
867 | 867 |
868 } else { | 868 } else { |
869 cl->buf->pos += rb->rest; | 869 cl->buf->pos += (size_t) rb->rest; |
870 rb->rest = 0; | 870 rb->rest = 0; |
871 b->last = cl->buf->pos; | 871 b->last = cl->buf->pos; |
872 b->last_buf = 1; | 872 b->last_buf = 1; |
873 } | 873 } |
874 | 874 |
970 ll = &tl->next; | 970 ll = &tl->next; |
971 | 971 |
972 size = cl->buf->last - cl->buf->pos; | 972 size = cl->buf->last - cl->buf->pos; |
973 | 973 |
974 if ((off_t) size > rb->chunked->size) { | 974 if ((off_t) size > rb->chunked->size) { |
975 cl->buf->pos += rb->chunked->size; | 975 cl->buf->pos += (size_t) rb->chunked->size; |
976 r->headers_in.content_length_n += rb->chunked->size; | 976 r->headers_in.content_length_n += rb->chunked->size; |
977 rb->chunked->size = 0; | 977 rb->chunked->size = 0; |
978 | 978 |
979 } else { | 979 } else { |
980 rb->chunked->size -= size; | 980 rb->chunked->size -= size; |