Proper datatypes for several function arguments.

LeaHeader.c

@@ -1,8 +1,8 @@
 #include "LeaHeader.h"
 
 //returns a pointer to the header of the block	
-leaHdr *getHeader(const char * ptr) {
-	return (leaHdr *) (ptr - HDR_SIZE);
+leaHdr *getHeader(const void * ptr) {
+	return (leaHdr *) ((char *) ptr - HDR_SIZE);
 }
 
 size_t getSize (void *ptr) {
@@ -34,16 +34,16 @@ void markPrevFree (char * ptr) {
 	getHeader(ptr)->previous_size &= (size_t) (~ 1);
 }
 
-void markPrevInUse (char * ptr) {
+void markPrevInUse (void * ptr) {
 	getHeader(ptr)->previous_size |= 1;
 }
 
-size_t isPrevFree (char * ptr) {
+size_t isPrevFree (void * ptr) {
 	size_t free = ~(getHeader(ptr)->previous_size & 1);
 	return (free & 1) ;
 }
 
-void markInUse (char * ptr) {
+void markInUse (void * ptr) {
 	markPrevInUse(getNext(ptr));
 }
 

LeaHeader.h

@@ -18,7 +18,7 @@ typedef struct LeaHeader* leaHdr_ptr;
 
 
 //returns a pointer to the header of the block	
-leaHdr * getHeader(const char * ptr);
+leaHdr * getHeader(const void *ptr);
 
 void *getNext(void *ptr);
 
@@ -32,11 +32,11 @@ void setPrevSize (void *ptr, size_t sz);
 
 void markPrevFree (char * ptr);
 
-void markPrevInUse (char * ptr);
+void markPrevInUse (void *ptr);
 
-size_t isPrevFree (char * ptr);
+size_t isPrevFree (void *ptr);
 
-void markInUse (char * ptr);
+void markInUse (void *ptr);
 
 void markFree (char * ptr);
 

dmm_init.c

@@ -3,13 +3,13 @@
 #include <pthread.h>
 #include "dmm_init.h"
 
-allocator_t *dmm_init(void) {
+allocator_t * dmm_init(void) {
 	int i;
 	allocator_t *main_allocator;
 	heap_t *current_heap;
 	MAPTABLE_NODE *maptablenode;
 
-	main_allocator = (allocator_t *) sbrk(sizeof(allocator_t));
+	main_allocator = (allocator_t *) sbrk((int) sizeof(allocator_t));
 
 	for(i = 0; i < NUM_HEAPS; i++) {
 		main_allocator->heaps[i].maptable_head = NULL;
@@ -26,7 +26,7 @@ allocator_t *dmm_init(void) {
 	// 2 last ones with 64 and 256 (2 fixed lists per heap)
 	// 2 * 4 + 2 * 2 = 12 maptable nodes
 	current_heap = &main_allocator->heaps[0];
-	maptablenode = (MAPTABLE_NODE *) sbrk(12*(sizeof(MAPTABLE_NODE)));
+	maptablenode = (MAPTABLE_NODE *) sbrk((int)(12*(sizeof(MAPTABLE_NODE))));
 
 	maptablenode->size = 32;
 	maptablenode->fixed_list_head = NULL;

other.c

@@ -13,7 +13,7 @@ size_t req_padding(size_t size) {
 	return size;
 }
 
-int map_size_to_list(heap_t *heap, unsigned int sz) {
+int map_size_to_list(heap_t *heap, size_t sz) {
 	int i;
 	MAPTABLE_NODE *node;
 	i = 0;

other.h

@@ -5,7 +5,7 @@
 
 size_t req_padding(size_t size);
 
-int map_size_to_list(heap_t *heap, unsigned int sz);
+int map_size_to_list(heap_t *heap, size_t sz);
 
 int map_thread_heap(void);
 

sys_alloc.c

@@ -13,7 +13,7 @@ void setHeaders(void *ptr, size_t sz) {
 	setSize(ptr,sz);
 	markInUse(ptr);
 	setPrevSize(getNext(ptr), sz);
-	setSize(getNext(ptr), 0); //border block
+	setSize(getNext(ptr), (size_t) 0); //border block
 	markInUse(getNext(ptr)); //border block
 }
 
@@ -26,7 +26,7 @@ void *sys_alloc(size_t size) {
 
 	if (borderPtr == NULL) {
 
-		ptr = sbrk((intptr_t) (allocation_size + 2*HDR_SIZE)); //extra space for coalescing support
+		ptr = sbrk((int) (allocation_size + 2*HDR_SIZE)); //extra space for coalescing support
 
 		if (ptr == (void *) -1){
 			printf("sbrk Fail\n");
@@ -35,13 +35,13 @@ void *sys_alloc(size_t size) {
 
 		//printf("sbrk = %p\n",ptr);
 
-		setPrevSize((char *) ptr + HDR_SIZE, 0);
+		setPrevSize((char *) ptr + HDR_SIZE, (size_t) 0);
 		markPrevInUse((char *) ptr + HDR_SIZE);
 		borderPtr = ptr;
 
 	} else {
 
-		ptr = sbrk((intptr_t) allocation_size);
+		ptr = sbrk((int) allocation_size);
 
 		if ((ptr == (char *) -1)){
 			printf("sbrk Fail: out of Memory\n");