From a947a1d5ae074f341716d2478922a6d23208bb77 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Tue, 6 Feb 2018 18:15:51 +0000
Subject: MISRA-related fixes.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11455 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/common/oslib/src/chfactory.c | 20 ++++++++++----------
 os/common/oslib/src/chheap.c    |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'os/common/oslib/src')

diff --git a/os/common/oslib/src/chfactory.c b/os/common/oslib/src/chfactory.c
index 57fe9f85c..05a4f5d8e 100644
--- a/os/common/oslib/src/chfactory.c
+++ b/os/common/oslib/src/chfactory.c
@@ -120,7 +120,7 @@ static dyn_element_t *dyn_list_unlink(dyn_element_t *element,
   return NULL;
 }
 
-#if (CH_FACTORY_REQUIRES_HEAP == TRUE) || defined(__DOXYGEN__)
+#if CH_FACTORY_REQUIRES_HEAP || defined(__DOXYGEN__)
 static dyn_element_t *dyn_create_object_heap(const char *name,
                                              dyn_list_t *dlp,
                                              size_t size) {
@@ -142,7 +142,7 @@ static dyn_element_t *dyn_create_object_heap(const char *name,
 
   /* Initializing object list element.*/
   strncpy(dep->name, name, CH_CFG_FACTORY_MAX_NAMES_LENGTH);
-  dep->refs = 1U;
+  dep->refs = (ucnt_t)1;
   dep->next = dlp->next;
 
   /* Updating factory list.*/
@@ -155,18 +155,18 @@ static void dyn_release_object_heap(dyn_element_t *dep,
                                     dyn_list_t *dlp) {
 
   chDbgCheck(dep != NULL);
-  chDbgAssert(dep->refs > 0U, "invalid references number");
+  chDbgAssert(dep->refs > (ucnt_t)0, "invalid references number");
 
 
   dep->refs--;
-  if (dep->refs == 0U) {
+  if (dep->refs == (ucnt_t)0) {
     dep = dyn_list_unlink(dep, dlp);
     chHeapFree((void *)dep);
   }
 }
-#endif /* CH_FACTORY_REQUIRES_HEAP == TRUE */
+#endif /* CH_FACTORY_REQUIRES_HEAP */
 
-#if (CH_FACTORY_REQUIRES_POOLS == TRUE) || defined(__DOXYGEN__)
+#if CH_FACTORY_REQUIRES_POOLS || defined(__DOXYGEN__)
 static dyn_element_t *dyn_create_object_pool(const char *name,
                                              dyn_list_t *dlp,
                                              memory_pool_t *mp) {
@@ -188,7 +188,7 @@ static dyn_element_t *dyn_create_object_pool(const char *name,
 
   /* Initializing object list element.*/
   strncpy(dep->name, name, CH_CFG_FACTORY_MAX_NAMES_LENGTH);
-  dep->refs = 1U;
+  dep->refs = (ucnt_t)1;
   dep->next = dlp->next;
 
   /* Updating factory list.*/
@@ -202,15 +202,15 @@ static void dyn_release_object_pool(dyn_element_t *dep,
                                     memory_pool_t *mp) {
 
   chDbgCheck(dep != NULL);
-  chDbgAssert(dep->refs > 0U, "invalid references number");
+  chDbgAssert(dep->refs > (ucnt_t)0, "invalid references number");
 
   dep->refs--;
-  if (dep->refs == 0U) {
+  if (dep->refs == (ucnt_t)0) {
     dep = dyn_list_unlink(dep, dlp);
     chPoolFree(mp, (void *)dep);
   }
 }
-#endif /* CH_FACTORY_REQUIRES_POOLS == TRUE */
+#endif /* CH_FACTORY_REQUIRES_POOLS */
 
 static dyn_element_t *dyn_find_object(const char *name, dyn_list_t *dlp) {
   dyn_element_t *dep;
diff --git a/os/common/oslib/src/chheap.c b/os/common/oslib/src/chheap.c
index d6e2eeca6..d3d25458f 100644
--- a/os/common/oslib/src/chheap.c
+++ b/os/common/oslib/src/chheap.c
@@ -135,7 +135,9 @@ void chHeapObjectInit(memory_heap_t *heapp, void *buf, size_t size) {
 
   /* Adjusting the size in case the initial block was not correctly
      aligned.*/
+  /*lint -save -e9033 [10.8] Required cast operations.*/
   size -= (size_t)((uint8_t *)hp - (uint8_t *)buf);
+  /*lint restore*/
 
   /* Initializing the heap header.*/
   heapp->provider = NULL;
-- 
cgit v1.2.3