Mercurial > hg > nginx
comparison src/core/ngx_slab.c @ 5362:79b9101cecf4
Handling of ngx_int_t != intptr_t case.
Casts between pointers and integers produce warnings on size mismatch. To
silence them, cast to (u)intptr_t should be used. Prevoiusly, casts to
ngx_(u)int_t were used in some cases, and several ngx_int_t expressions had
no casts.
As of now it's mostly style as ngx_int_t is defined as intptr_t.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 04 Sep 2013 21:16:59 +0400 |
parents | 40de49cf6b37 |
children | 5024d29354f1 |
comparison
equal
deleted
inserted
replaced
5361:7094d6da2806 | 5362:79b9101cecf4 |
---|---|
438 } | 438 } |
439 | 439 |
440 n = ((uintptr_t) p & (ngx_pagesize - 1)) >> shift; | 440 n = ((uintptr_t) p & (ngx_pagesize - 1)) >> shift; |
441 m = (uintptr_t) 1 << (n & (sizeof(uintptr_t) * 8 - 1)); | 441 m = (uintptr_t) 1 << (n & (sizeof(uintptr_t) * 8 - 1)); |
442 n /= (sizeof(uintptr_t) * 8); | 442 n /= (sizeof(uintptr_t) * 8); |
443 bitmap = (uintptr_t *) ((uintptr_t) p & ~(ngx_pagesize - 1)); | 443 bitmap = (uintptr_t *) |
444 ((uintptr_t) p & ~((uintptr_t) ngx_pagesize - 1)); | |
444 | 445 |
445 if (bitmap[n] & m) { | 446 if (bitmap[n] & m) { |
446 | 447 |
447 if (page->next == NULL) { | 448 if (page->next == NULL) { |
448 slots = (ngx_slab_page_t *) | 449 slots = (ngx_slab_page_t *) |