diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-06 19:25:26 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-06 19:25:26 +0000 |
| commit | 8a410f6946ff9f4721b74781a91a56256b66a4df (patch) | |
| tree | 831e01f67745d982f762552f48cfbc2d9ed82de2 /os/rt/src/chmempools.c | |
| parent | 07aba437fa499413e13b72441d6a76edf9ec8818 (diff) | |
| download | ChibiOS-8a410f6946ff9f4721b74781a91a56256b66a4df.tar.gz ChibiOS-8a410f6946ff9f4721b74781a91a56256b66a4df.tar.bz2 ChibiOS-8a410f6946ff9f4721b74781a91a56256b66a4df.zip | |
Even more MISRA.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7722 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/src/chmempools.c')
| -rw-r--r-- | os/rt/src/chmempools.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/os/rt/src/chmempools.c b/os/rt/src/chmempools.c index 43b4268b8..e5c656844 100644 --- a/os/rt/src/chmempools.c +++ b/os/rt/src/chmempools.c @@ -37,7 +37,7 @@ #include "ch.h"
-#if CH_CFG_USE_MEMPOOLS || defined(__DOXYGEN__)
+#if (CH_CFG_USE_MEMPOOLS == TRUE) || defined(__DOXYGEN__)
/*===========================================================================*/
/* Module exported variables. */
@@ -98,7 +98,7 @@ void chPoolLoadArray(memory_pool_t *mp, void *p, size_t n) { chDbgCheck((mp != NULL) && (n != 0));
- while (n) {
+ while (n != 0U) {
chPoolAdd(mp, p);
p = (void *)(((uint8_t *)p) + mp->mp_object_size);
n--;
@@ -121,12 +121,15 @@ void *chPoolAllocI(memory_pool_t *mp) { chDbgCheckClassI();
chDbgCheck(mp != NULL);
- if ((objp = mp->mp_next) != NULL) {
+ objp = mp->mp_next;
+ /*lint -save -e9013 [15.7] There is no else because it is not needed.*/
+ if (objp != NULL) {
mp->mp_next = mp->mp_next->ph_next;
}
else if (mp->mp_provider != NULL) {
objp = mp->mp_provider(mp->mp_object_size);
}
+ /*lint -restore*/
return objp;
}
@@ -192,6 +195,6 @@ void chPoolFree(memory_pool_t *mp, void *objp) { chSysUnlock();
}
-#endif /* CH_CFG_USE_MEMPOOLS */
+#endif /* CH_CFG_USE_MEMPOOLS == TRUE */
/** @} */
|