diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-03 11:01:09 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-03 11:01:09 +0000 |
| commit | fbd65c1f6ae3c802467ab99f4b2fe9c7c084972e (patch) | |
| tree | cafc124edd19ce4f3b676a9de703f7a0aefed409 /os/rt/src/chmempools.c | |
| parent | 3d1a86e9fb0b9495a726dab534e97c063b5f368b (diff) | |
| download | ChibiOS-fbd65c1f6ae3c802467ab99f4b2fe9c7c084972e.tar.gz ChibiOS-fbd65c1f6ae3c802467ab99f4b2fe9c7c084972e.tar.bz2 ChibiOS-fbd65c1f6ae3c802467ab99f4b2fe9c7c084972e.zip | |
MISRA-related fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7711 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/src/chmempools.c')
| -rw-r--r-- | os/rt/src/chmempools.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/os/rt/src/chmempools.c b/os/rt/src/chmempools.c index 7afd5525f..43b4268b8 100644 --- a/os/rt/src/chmempools.c +++ b/os/rt/src/chmempools.c @@ -121,10 +121,13 @@ void *chPoolAllocI(memory_pool_t *mp) { chDbgCheckClassI();
chDbgCheck(mp != NULL);
- if ((objp = mp->mp_next) != NULL)
+ if ((objp = mp->mp_next) != NULL) {
mp->mp_next = mp->mp_next->ph_next;
- else if (mp->mp_provider != NULL)
+ }
+ else if (mp->mp_provider != NULL) {
objp = mp->mp_provider(mp->mp_object_size);
+ }
+
return objp;
}
@@ -144,6 +147,7 @@ void *chPoolAlloc(memory_pool_t *mp) { chSysLock();
objp = chPoolAllocI(mp);
chSysUnlock();
+
return objp;
}
|