X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26ba5558401021cb3854f2f1a5ffedd7044f6823..e709643ef0c5b61c6c878016c418bffa2b1b20cd:/src/xbt/mmalloc/mmorecore.c diff --git a/src/xbt/mmalloc/mmorecore.c b/src/xbt/mmalloc/mmorecore.c index 54650ed554..d59a2a3c75 100644 --- a/src/xbt/mmalloc/mmorecore.c +++ b/src/xbt/mmalloc/mmorecore.c @@ -1,6 +1,6 @@ /* Support for an sbrk-like function that uses mmap. */ -/* Copyright (c) 2010-2019. The SimGrid Team. +/* Copyright (c) 2010-2020. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -79,7 +79,7 @@ void *mmorecore(struct mdesc *mdp, ssize_t size) /* We are deallocating memory. If the amount requested would cause us to try to deallocate back past the base of * the mmap'd region then die verbosely. Otherwise, deallocate the memory and return the old break value. */ if (((char*)mdp->breakval) + size >= (char*)mdp->base) { - result = (void*)mdp->breakval; + result = mdp->breakval; mdp->breakval = (char*)mdp->breakval + size; moveto = PAGE_ALIGN(mdp->breakval); munmap(moveto, (size_t)(((char*)mdp->top) - ((char*)moveto)) - 1); @@ -134,11 +134,11 @@ void *mmorecore(struct mdesc *mdp, ssize_t size) mdp->base = mdp->breakval = mapto; mdp->top = PAGE_ALIGN((char*)mdp->breakval + size); - result = (void *) mdp->breakval; + result = mdp->breakval; mdp->breakval = (char*)mdp->breakval + size; } else { /* Memory is already mapped, we only need to increase the breakval: */ - result = (void *) mdp->breakval; + result = mdp->breakval; mdp->breakval = (char*)mdp->breakval + size; } }