aboutsummaryrefslogtreecommitdiffstats
path: root/os/rt/src/chheap.c
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-03-07 07:18:08 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-03-07 07:18:08 +0000
commit4de725748239e122b27ff2b31aac32b835e8a2d6 (patch)
tree7a5f663a5dcc2c370b51a7d72f5efd5b81d5f6a7 /os/rt/src/chheap.c
parentf6374e3911aebabe120f74369fd3dd6ecef489cd (diff)
downloadChibiOS-4de725748239e122b27ff2b31aac32b835e8a2d6.tar.gz
ChibiOS-4de725748239e122b27ff2b31aac32b835e8a2d6.tar.bz2
ChibiOS-4de725748239e122b27ff2b31aac32b835e8a2d6.zip
More MISRA.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7725 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/src/chheap.c')
-rw-r--r--os/rt/src/chheap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/os/rt/src/chheap.c b/os/rt/src/chheap.c
index a2635c72d..5214462ce 100644
--- a/os/rt/src/chheap.c
+++ b/os/rt/src/chheap.c
@@ -110,7 +110,7 @@ void chHeapObjectInit(memory_heap_t *heapp, void *buf, size_t size) {
chDbgCheck(MEM_IS_ALIGNED(buf) && MEM_IS_ALIGNED(size));
- heapp->h_provider = (memgetfunc_t)NULL;
+ heapp->h_provider = NULL;
heapp->h_free.h.u.next = hp;
heapp->h_free.h.size = 0;
hp->h.u.next = NULL;
@@ -162,7 +162,7 @@ void *chHeapAlloc(memory_heap_t *heapp, size_t size) {
/* Block bigger enough, must split it.*/
fp = (void *)((uint8_t *)(hp) + sizeof(union heap_header) + size);
fp->h.u.next = hp->h.u.next;
- fp->h.size = hp->h.size - sizeof(union heap_header) - size;
+ fp->h.size = (hp->h.size - sizeof(union heap_header)) - size;
qp->h.u.next = fp;
hp->h.size = size;
}