Mercurial > hg > nginx
comparison src/core/ngx_resolver.c @ 6860:f18c285c2e59
Win32: fixed some warnings reported by Borland C.
Most notably, warning W8012 (comparing signed and unsigned values) reported
in multiple places where an unsigned value of small type (e.g., u_short) is
promoted to an int and compared to an unsigned value.
Warning W8072 (suspicious pointer arithmetic) disabled, it is reported
when we increment base pointer in ngx_shm_alloc().
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sat, 24 Dec 2016 18:01:14 +0300 |
| parents | d72b38376092 |
| children | a72886067bbb |
comparison
equal
deleted
inserted
replaced
| 6859:38df52d4e250 | 6860:f18c285c2e59 |
|---|---|
| 778 ngx_resolver_free_locked(r, rn->u6.addrs6); | 778 ngx_resolver_free_locked(r, rn->u6.addrs6); |
| 779 } | 779 } |
| 780 #endif | 780 #endif |
| 781 | 781 |
| 782 if (rn->nsrvs) { | 782 if (rn->nsrvs) { |
| 783 for (i = 0; i < rn->nsrvs; i++) { | 783 for (i = 0; i < (ngx_uint_t) rn->nsrvs; i++) { |
| 784 if (rn->u.srvs[i].name.data) { | 784 if (rn->u.srvs[i].name.data) { |
| 785 ngx_resolver_free_locked(r, rn->u.srvs[i].name.data); | 785 ngx_resolver_free_locked(r, rn->u.srvs[i].name.data); |
| 786 } | 786 } |
| 787 } | 787 } |
| 788 | 788 |
| 2957 | 2957 |
| 2958 if (ctx->event && ctx->event->timer_set) { | 2958 if (ctx->event && ctx->event->timer_set) { |
| 2959 ngx_del_timer(ctx->event); | 2959 ngx_del_timer(ctx->event); |
| 2960 } | 2960 } |
| 2961 | 2961 |
| 2962 for (i = 0; i < rn->nsrvs; i++) { | 2962 for (i = 0; i < (ngx_uint_t) rn->nsrvs; i++) { |
| 2963 srvs[i].name.data = ngx_resolver_alloc(r, rn->u.srvs[i].name.len); | 2963 srvs[i].name.data = ngx_resolver_alloc(r, rn->u.srvs[i].name.len); |
| 2964 if (srvs[i].name.data == NULL) { | 2964 if (srvs[i].name.data == NULL) { |
| 2965 goto failed; | 2965 goto failed; |
| 2966 } | 2966 } |
| 2967 | 2967 |
| 4075 ngx_resolver_free_locked(r, rn->u6.addrs6); | 4075 ngx_resolver_free_locked(r, rn->u6.addrs6); |
| 4076 } | 4076 } |
| 4077 #endif | 4077 #endif |
| 4078 | 4078 |
| 4079 if (rn->nsrvs) { | 4079 if (rn->nsrvs) { |
| 4080 for (i = 0; i < rn->nsrvs; i++) { | 4080 for (i = 0; i < (ngx_uint_t) rn->nsrvs; i++) { |
| 4081 if (rn->u.srvs[i].name.data) { | 4081 if (rn->u.srvs[i].name.data) { |
| 4082 ngx_resolver_free_locked(r, rn->u.srvs[i].name.data); | 4082 ngx_resolver_free_locked(r, rn->u.srvs[i].name.data); |
| 4083 } | 4083 } |
| 4084 } | 4084 } |
| 4085 | 4085 |
| 4204 | 4204 |
| 4205 if (d == n) { | 4205 if (d == n) { |
| 4206 d = 0; | 4206 d = 0; |
| 4207 } | 4207 } |
| 4208 | 4208 |
| 4209 if (j == rn->naddrs) { | 4209 if (j == (ngx_uint_t) rn->naddrs) { |
| 4210 j = 0; | 4210 j = 0; |
| 4211 } | 4211 } |
| 4212 } while (++i < rn->naddrs); | 4212 } while (++i < (ngx_uint_t) rn->naddrs); |
| 4213 } | 4213 } |
| 4214 | 4214 |
| 4215 #if (NGX_HAVE_INET6) | 4215 #if (NGX_HAVE_INET6) |
| 4216 if (rn->naddrs6) { | 4216 if (rn->naddrs6) { |
| 4217 j = rotate ? ngx_random() % rn->naddrs6 : 0; | 4217 j = rotate ? ngx_random() % rn->naddrs6 : 0; |