[commit: ghc] master: rts: delint/detab/dewhitespace OSMem.c (b1fb531)
git at git.haskell.org
git at git.haskell.org
Mon Jul 28 14:34:46 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/b1fb531e0ca0123563e233fe1f4c41e3ce5d84f1/ghc
>---------------------------------------------------------------
commit b1fb531e0ca0123563e233fe1f4c41e3ce5d84f1
Author: Austin Seipp <austin at well-typed.com>
Date: Mon Jul 21 10:34:08 2014 -0500
rts: delint/detab/dewhitespace OSMem.c
Signed-off-by: Austin Seipp <austin at well-typed.com>
>---------------------------------------------------------------
b1fb531e0ca0123563e233fe1f4c41e3ce5d84f1
rts/posix/OSMem.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
index 69140a9..8a6a85e 100644
--- a/rts/posix/OSMem.c
+++ b/rts/posix/OSMem.c
@@ -108,10 +108,12 @@ my_mmap (void *addr, W_ size)
if(err) {
// don't know what the error codes mean exactly, assume it's
// not our problem though.
- errorBelch("memory allocation failed (requested %" FMT_Word " bytes)", size);
+ errorBelch("memory allocation failed (requested %" FMT_Word " bytes)",
+ size);
stg_exit(EXIT_FAILURE);
} else {
- vm_protect(mach_task_self(),(vm_address_t)ret,size,FALSE,VM_PROT_READ|VM_PROT_WRITE);
+ vm_protect(mach_task_self(), (vm_address_t)ret, size, FALSE,
+ VM_PROT_READ|VM_PROT_WRITE);
}
#elif linux_HOST_OS
ret = mmap(addr, size, PROT_READ | PROT_WRITE,
@@ -210,7 +212,9 @@ osGetMBlocks(nat n)
if (((W_)ret & MBLOCK_MASK) != 0) {
// misaligned block!
#if 0 // defined(DEBUG)
- errorBelch("warning: getMBlock: misaligned block %p returned when allocating %d megablock(s) at %p", ret, n, next_request);
+ errorBelch("warning: getMBlock: misaligned block %p returned "
+ "when allocating %d megablock(s) at %p",
+ ret, n, next_request);
#endif
// unmap this block...
@@ -289,7 +293,8 @@ StgWord64 getPhysicalMemorySize (void)
long ret = sysconf(_SC_PHYS_PAGES);
if (ret == -1) {
#if defined(DEBUG)
- errorBelch("warning: getPhysicalMemorySize: cannot get physical memory size");
+ errorBelch("warning: getPhysicalMemorySize: cannot get "
+ "physical memory size");
#endif
return 0;
}
More information about the ghc-commits
mailing list