From b4dde0d786e73cea46a49965fcb25333edc7abee Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 10 Feb 2018 10:10:57 +0000
Subject: MISRA-related changes.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11470 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 doc/nil/reports/misra.txt       |  4 ++--
 os/common/oslib/src/chfactory.c |  6 ++++++
 test/nil/testbuild/.cproject    | 18 +++++++++++++-----
 test/nil/testbuild/Makefile     |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/doc/nil/reports/misra.txt b/doc/nil/reports/misra.txt
index b534bb8ee..64b5c2d70 100644
--- a/doc/nil/reports/misra.txt
+++ b/doc/nil/reports/misra.txt
@@ -1,8 +1,6 @@
 
 --- Module:   ..\..\..\os\common\startup\ARMCMx\compilers\GCC\crt1.c (C)
 
---- Module:   ..\..\..\os\common\startup\ARMCMx\compilers\GCC\vectors.c (C)
-
 --- Module:   ..\..\..\os\nil\src\ch.c (C)
 
 --- Module:   ..\..\..\os\common\oslib\src\chmboxes.c (C)
@@ -13,6 +11,8 @@
 
 --- Module:   ..\..\..\os\common\oslib\src\chmempools.c (C)
 
+--- Module:   ..\..\..\os\common\oslib\src\chfactory.c (C)
+
 --- Module:   ..\..\..\os\common\ports\ARMCMx\chcore.c (C)
 
 --- Module:   ..\..\..\os\common\ports\ARMCMx\chcore_v7m.c (C)
diff --git a/os/common/oslib/src/chfactory.c b/os/common/oslib/src/chfactory.c
index 05a4f5d8e..dbb13cab8 100644
--- a/os/common/oslib/src/chfactory.c
+++ b/os/common/oslib/src/chfactory.c
@@ -135,6 +135,8 @@ static dyn_element_t *dyn_create_object_heap(const char *name,
   }
 
   /* Allocating space for the new buffer object.*/
+  /*lint -save -e668 [] Lint is confused by the above chDbgCheck() and
+    incorrectly assumes that strncpy() could receive a NULL pointer.*/
   dep = (dyn_element_t *)chHeapAlloc(NULL, size);
   if (dep == NULL) {
     return NULL;
@@ -142,6 +144,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);
+  /*lint -restore*/
   dep->refs = (ucnt_t)1;
   dep->next = dlp->next;
 
@@ -187,7 +190,10 @@ static dyn_element_t *dyn_create_object_pool(const char *name,
   }
 
   /* Initializing object list element.*/
+  /*lint -save -e668 [] Lint is confused by the above chDbgCheck() and
+    incorrectly assumes that strncpy() could receive a NULL pointer.*/
   strncpy(dep->name, name, CH_CFG_FACTORY_MAX_NAMES_LENGTH);
+  /*lint -restore*/
   dep->refs = (ucnt_t)1;
   dep->next = dlp->next;
 
diff --git a/test/nil/testbuild/.cproject b/test/nil/testbuild/.cproject
index e303e64dc..069aab267 100644
--- a/test/nil/testbuild/.cproject
+++ b/test/nil/testbuild/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="0.114656749">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.114656749" moduleId="org.eclipse.cdt.core.settings" name="Default">
@@ -41,12 +39,22 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="NIL-BUILD_TEST.null.1703860681" name="NIL-BUILD_TEST"/>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		<scannerConfigBuildInfo instanceId="0.114656749">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;" command="arm-none-eabi-gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
 		</scannerConfigBuildInfo>
 	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope"/>
 </cproject>
diff --git a/test/nil/testbuild/Makefile b/test/nil/testbuild/Makefile
index d17de8134..19cae4420 100755
--- a/test/nil/testbuild/Makefile
+++ b/test/nil/testbuild/Makefile
@@ -198,7 +198,7 @@ CPPWARN = -Wall -Wextra -Wundef
 #
 
 # List all user C define here, like -D_DEBUG=1
-UDEFS = -DSTM32F303xC
+UDEFS = -DSTM32F303xC -D__ARM_ARCH_7EM__=1
 
 # Define ASM defines here
 UADEFS =
-- 
cgit v1.2.3