nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the rest of the GCC warnings on OpenBSD_malloc_linux.c

Browse Source 
svn:r15698
This commit is contained in:
Nick Mathewson 2008-07-06 18:33:35 +00:00
parent f302f23270
commit 1a564901e4
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/OpenBSD_malloc_Linux.c
View File

@ -123,7 +123,7 @@ struct pginfo {
}; };
/* How many bits per u_long in the bitmap */ /* How many bits per u_long in the bitmap */
#define MALLOC_BITS (NBBY * sizeof(u_long)) #define MALLOC_BITS (int)((NBBY * sizeof(u_long)))
/* /*
* This structure describes a number of free pages. * This structure describes a number of free pages.
@ -514,16 +514,17 @@ malloc_exit(void)
static void *MMAP_A(size_t pages, size_t alignment) static void *MMAP_A(size_t pages, size_t alignment)
{ {
void *j; void *j, *p;
if (pages%malloc_pagesize != 0) size_t first_size, rest, begin, end;
pages = pages - pages%malloc_pagesize + malloc_pagesize; if (pages%malloc_pagesize != 0)
size_t first_size = pages + alignment - malloc_pagesize; pages = pages - pages%malloc_pagesize + malloc_pagesize;
void *p = MMAP(first_size); first_size = pages + alignment - malloc_pagesize;
size_t rest = ((size_t)p) % alignment; p = MMAP(first_size);
rest = ((size_t)p) % alignment;
j = (rest == 0) ? p : (void*) ((size_t)p + alignment - rest); j = (rest == 0) ? p : (void*) ((size_t)p + alignment - rest);
size_t begin = (size_t)j - (size_t)p; begin = (size_t)j - (size_t)p;
if (begin != 0) munmap(p, begin); if (begin != 0) munmap(p, begin);
size_t end = (size_t)p + first_size - ((size_t)j + pages); end = (size_t)p + first_size - ((size_t)j + pages);
if(end != 0) munmap( (void*) ((size_t)j + pages), end); if(end != 0) munmap( (void*) ((size_t)j + pages), end);
return j; return j;
@ -830,7 +831,7 @@ static void *
malloc_pages(size_t size) malloc_pages(size_t size)
{ {
void *p, *delay_free = NULL, *tp; void *p, *delay_free = NULL, *tp;
int i; size_t i;
struct pginfo **pd; struct pginfo **pd;
struct pdinfo *pi; struct pdinfo *pi;
u_long pidx, index; u_long pidx, index;
@ -962,6 +963,7 @@ malloc_pages(size_t size)
} }
pd = pi->base; pd = pi->base;
pd[PI_OFF(index)] = MALLOC_FIRST; pd[PI_OFF(index)] = MALLOC_FIRST;
for (i = 1; i < size; i++) { for (i = 1; i < size; i++) {
if (!PI_OFF(index + i)) { if (!PI_OFF(index + i)) {
pidx++; pidx++;
@ -992,6 +994,7 @@ malloc_pages(size_t size)
} }
pd[PI_OFF(index + i)] = MALLOC_FIRST; pd[PI_OFF(index + i)] = MALLOC_FIRST;
} }
malloc_used += size << malloc_pageshift; malloc_used += size << malloc_pageshift;
malloc_guarded += malloc_guard; malloc_guarded += malloc_guard;