Merge pull request #272 from skliper/fix265-include_quotes

Fix #265, Use quotes for local includes
nasa · Mar 17, 2021 · 7a83be4 · 7a83be4
2 parents 1a799ef + a8c9b36
commit 7a83be4
Show file tree

Hide file tree

Showing 94 changed files with 143 additions and 143 deletions.
diff --git a/fsw/inc/cfe_psp_configdata.h b/fsw/inc/cfe_psp_configdata.h
@@ -29,9 +29,9 @@
 #define CFE_PSP_CONFIG_H_
 
 /* osapi.h is required for the definition of OS_VolumeInto_t */
-#include <osapi.h>
+#include "osapi.h"
 /* cfe_psp.h is required for the definition of CFE_PSP_MemTable_t */
-#include <cfe_psp.h>
+#include "cfe_psp.h"
 
 /*
 ** PSP software version record

diff --git a/fsw/mcp750-vxworks/src/cfe_psp_exception.c b/fsw/mcp750-vxworks/src/cfe_psp_exception.c
@@ -58,7 +58,7 @@
 #include "cfe_psp_exceptionstorage_api.h"
 #include "cfe_psp_memory.h"
 
-#include <target_config.h>
+#include "target_config.h"
 
 /*
 **

diff --git a/fsw/mcp750-vxworks/src/cfe_psp_memory.c b/fsw/mcp750-vxworks/src/cfe_psp_memory.c
@@ -56,7 +56,7 @@
 #include "cfe_psp.h"
 #include "cfe_psp_memory.h"
 
-#include <target_config.h>
+#include "target_config.h"
 
 /*
 ** External Declarations

diff --git a/fsw/mcp750-vxworks/src/cfe_psp_start.c b/fsw/mcp750-vxworks/src/cfe_psp_start.c
@@ -70,7 +70,7 @@ IMPORT void sysPciWrite32(UINT32, UINT32);
  * the dynamically generated configuration object. This allows a single build
  * of the PSP to be completely CFE-independent.
  */
-#include <target_config.h>
+#include "target_config.h"
 
 #define CFE_PSP_MAIN_FUNCTION (*GLOBAL_CONFIGDATA.CfeConfig->SystemMain)
 #define CFE_PSP_NONVOL_STARTUP_FILE (GLOBAL_CONFIGDATA.CfeConfig->NonvolStartupFile)

diff --git a/fsw/mcp750-vxworks/src/cfe_psp_support.c b/fsw/mcp750-vxworks/src/cfe_psp_support.c
@@ -61,7 +61,7 @@
 #include "cfe_psp.h"
 #include "cfe_psp_memory.h"
 
-#include <target_config.h>
+#include "target_config.h"
 
 #define CFE_PSP_CPU_ID (GLOBAL_CONFIGDATA.Default_CpuId)
 #define CFE_PSP_CPU_NAME (GLOBAL_CONFIGDATA.Default_CpuName)

diff --git a/fsw/pc-linux/src/cfe_psp_memory.c b/fsw/pc-linux/src/cfe_psp_memory.c
@@ -68,7 +68,7 @@
 #define CFE_PSP_RESET_KEY_FILE ".resetkeyfile"
 #define CFE_PSP_RESERVED_KEY_FILE ".reservedkeyfile"
 
-#include <target_config.h>
+#include "target_config.h"
 
 /*
  * Define the PSP-supported capacities to be the maximum allowed,

diff --git a/fsw/pc-linux/src/cfe_psp_start.c b/fsw/pc-linux/src/cfe_psp_start.c
@@ -61,7 +61,7 @@
  * the dynamically generated configuration object. This allows a single build
  * of the PSP to be completely CFE-independent.
  */
-#include <target_config.h>
+#include "target_config.h"
 #include "cfe_psp_module.h"
 
 #define CFE_PSP_MAIN_FUNCTION (*GLOBAL_CONFIGDATA.CfeConfig->SystemMain)

diff --git a/fsw/pc-rtems/src/cfe_psp_memory.c b/fsw/pc-rtems/src/cfe_psp_memory.c
@@ -56,7 +56,7 @@
 /*
 ** Macro Definitions
 */
-#include <target_config.h>
+#include "target_config.h"
 
 /*
  * Define the PSP-supported capacities to be the maximum allowed,

diff --git a/fsw/pc-rtems/src/cfe_psp_start.c b/fsw/pc-rtems/src/cfe_psp_start.c
@@ -55,7 +55,7 @@ extern int rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
  * the dynamically generated configuration object. This allows a single build
  * of the PSP to be completely CFE-independent.
  */
-#include <target_config.h>
+#include "target_config.h"
 
 #define CFE_PSP_MAIN_FUNCTION (*GLOBAL_CONFIGDATA.CfeConfig->SystemMain)
 #define CFE_PSP_NONVOL_STARTUP_FILE (GLOBAL_CONFIGDATA.CfeConfig->NonvolStartupFile)

diff --git a/fsw/pc-rtems/src/cfe_psp_support.c b/fsw/pc-rtems/src/cfe_psp_support.c
@@ -55,7 +55,7 @@
  * the dynamically generated configuration object. This allows a single build
  * of the PSP to be completely CFE-independent.
  */
-#include <target_config.h>
+#include "target_config.h"
 
 #define CFE_PSP_CPU_ID (GLOBAL_CONFIGDATA.Default_CpuId)
 #define CFE_PSP_CPU_NAME (GLOBAL_CONFIGDATA.Default_CpuName)

diff --git a/fsw/shared/inc/cfe_psp_exceptionstorage_api.h b/fsw/shared/inc/cfe_psp_exceptionstorage_api.h
@@ -27,7 +27,7 @@
 #ifndef CFE_PSP_EXCEPTIONSTORAGE_API_H_
 #define CFE_PSP_EXCEPTIONSTORAGE_API_H_
 
-#include <cfe_psp.h>
+#include "cfe_psp.h"
 
 /*
  * Abstract types for exception storage.

diff --git a/fsw/shared/inc/cfe_psp_exceptionstorage_types.h b/fsw/shared/inc/cfe_psp_exceptionstorage_types.h
@@ -27,8 +27,8 @@
 #ifndef CFE_PSP_EXCEPTIONSTORAGE_TYPES_H_
 #define CFE_PSP_EXCEPTIONSTORAGE_TYPES_H_
 
-#include <cfe_psp.h>
-#include <cfe_psp_config.h>
+#include "cfe_psp.h"
+#include "cfe_psp_config.h"
 
 /*
  * The "MetaData" stores ephemeral exception information

diff --git a/fsw/shared/inc/cfe_psp_module.h b/fsw/shared/inc/cfe_psp_module.h
@@ -30,8 +30,8 @@
 #ifndef CFE_PSP_MODULE_H_
 #define CFE_PSP_MODULE_H_
 
-#include <cfe_psp.h>
-#include <target_config.h>
+#include "cfe_psp.h"
+#include "target_config.h"
 
 typedef enum
 {

diff --git a/fsw/shared/src/cfe_psp_configdata.c b/fsw/shared/src/cfe_psp_configdata.c
@@ -25,10 +25,10 @@
  * Author: [email protected]
  */
 
-#include <cfe_psp.h>
-#include <cfe_psp_config.h>
-#include <psp_version.h>
-#include <cfe_psp_configdata.h>
+#include "cfe_psp.h"
+#include "cfe_psp_config.h"
+#include "psp_version.h"
+#include "cfe_psp_configdata.h"
 
 /**
  * Instantiation of the PSP/HW configuration data

diff --git a/fsw/shared/src/cfe_psp_exceptionstorage.c b/fsw/shared/src/cfe_psp_exceptionstorage.c
@@ -51,7 +51,7 @@
 #include "cfe_psp_exceptionstorage_api.h"
 #include "cfe_psp_memory.h"
 
-#include <target_config.h>
+#include "target_config.h"
 
 /*
 ** Constants

diff --git a/fsw/shared/src/cfe_psp_module.c b/fsw/shared/src/cfe_psp_module.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <osapi.h>
+#include "osapi.h"
 
 #include "cfe_psp_configdata.h"
 #include "cfe_psp_module.h"

diff --git a/fsw/shared/src/cfe_psp_version.c b/fsw/shared/src/cfe_psp_version.c
@@ -24,8 +24,8 @@
  * Defines API that obtains the values of the various version identifiers
  */
 
-#include <cfe_psp.h>
-#include <cfe_psp_configdata.h>
+#include "cfe_psp.h"
+#include "cfe_psp_configdata.h"
 
 /*----------------------------------------------------------------
  *

diff --git a/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h b/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDE_UT_ADAPTOR_BOOTREC_H_
 #define INCLUDE_UT_ADAPTOR_BOOTREC_H_
 
-#include <common_types.h>
+#include "common_types.h"
 
 void UT_Setup_ReservedMem_BootRec(void);
 uint32 UT_Get_ReservedMem_BootType(void);

diff --git a/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c b/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c
@@ -18,8 +18,8 @@
  */
 
 #include "ut-adaptor-bootrec.h"
-#include <cfe_psp_config.h>
-#include <cfe_psp_memory.h>
+#include "cfe_psp_config.h"
+#include "cfe_psp_memory.h"
 
 static CFE_PSP_ReservedMemoryBootRecord_t UT_BOOTREC;
 

diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c
@@ -20,12 +20,12 @@
 #include "coveragetest-psp-mcp750-vxworks.h"
 #include "ut-adaptor-bootrec.h"
 
-#include <cfe_psp.h>
+#include "cfe_psp.h"
 
-#include <PCS_sysLib.h>
-#include <PCS_mcpx750.h>
-#include <PCS_stdlib.h>
-#include <PCS_cfe_configdata.h>
+#include "PCS_sysLib.h"
+#include "PCS_mcpx750.h"
+#include "PCS_stdlib.h"
+#include "PCS_cfe_configdata.h"
 
 extern void UT_OS_Application_Startup(void);
 extern void UT_OS_Application_Run(void);

diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c
@@ -20,11 +20,11 @@
 #include "coveragetest-psp-mcp750-vxworks.h"
 #include "ut-adaptor-bootrec.h"
 
-#include <cfe_psp.h>
+#include "cfe_psp.h"
 
-#include <PCS_stdlib.h>
-#include <PCS_rebootLib.h>
-#include <PCS_cacheLib.h>
+#include "PCS_stdlib.h"
+#include "PCS_rebootLib.h"
+#include "PCS_cacheLib.h"
 #include "PCS_cfe_configdata.h"
 
 void Test_CFE_PSP_Restart(void)

diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h b/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h
@@ -20,11 +20,11 @@
 #ifndef INCLUDE_PSP_MCP750_VXWORKS_COVERAGETEST_H_
 #define INCLUDE_PSP_MCP750_VXWORKS_COVERAGETEST_H_
 
-#include <utassert.h>
-#include <uttest.h>
-#include <utstubs.h>
+#include "utassert.h"
+#include "uttest.h"
+#include "utstubs.h"
 
-#include <coveragetest-psp-shared.h>
+#include "coveragetest-psp-shared.h"
 
 #define ADD_TEST(test) UtTest_Add((Test_##test), Psp_Test_Setup, Psp_Test_Teardown, #test)
 

diff --git a/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h b/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h
@@ -20,8 +20,8 @@
 #ifndef INCLUDE_UT_ADAPTOR_EXCEPTIONS_H_
 #define INCLUDE_UT_ADAPTOR_EXCEPTIONS_H_
 
-#include <common_types.h>
-#include <cfe_psp_exceptionstorage_api.h>
+#include "common_types.h"
+#include "cfe_psp_exceptionstorage_api.h"
 
 uint32 UT_Get_Exception_MaxEntries(void);
 size_t UT_Get_Exception_Size(void);

diff --git a/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c b/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c
@@ -18,8 +18,8 @@
  */
 
 #include "ut-adaptor-exceptions.h"
-#include <cfe_psp_config.h>
-#include <cfe_psp_memory.h>
+#include "cfe_psp_config.h"
+#include "cfe_psp_memory.h"
 
 #define CFE_PSP_MAX_EXCEPTION_ENTRIES 4
 #define CFE_PSP_MAX_EXCEPTION_BACKTRACE_SIZE 16

diff --git a/unit-test-coverage/shared/inc/coveragetest-psp-shared.h b/unit-test-coverage/shared/inc/coveragetest-psp-shared.h
@@ -20,9 +20,9 @@
 #ifndef INCLUDE_PSP_SHARED_COVERAGETEST_H_
 #define INCLUDE_PSP_SHARED_COVERAGETEST_H_
 
-#include <utassert.h>
-#include <uttest.h>
-#include <utstubs.h>
+#include "utassert.h"
+#include "uttest.h"
+#include "utstubs.h"
 
 void Test_CFE_PSP_Exception_GetBuffer(void);
 void Test_CFE_PSP_Exception_GetNextContextBuffer(void);

diff --git a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c
@@ -21,13 +21,13 @@
 #include "utstubs.h"
 #include "ut-adaptor-exceptions.h"
 
-#include <cfe_psp.h>
-#include <cfe_psp_exceptionstorage_api.h>
+#include "cfe_psp.h"
+#include "cfe_psp_exceptionstorage_api.h"
 
 #ifdef jphfix
-#include <PCS_stdlib.h>
-#include <PCS_rebootLib.h>
-#include <PCS_cacheLib.h>
+#include "PCS_stdlib.h"
+#include "PCS_rebootLib.h"
+#include "PCS_cacheLib.h"
 #include "PCS_cfe_configdata.h"
 #endif
 

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h
@@ -2,7 +2,7 @@
 #ifndef _PSP_STUB_ESFPPC_H_
 #define _PSP_STUB_ESFPPC_H_
 
-#include <PCS_basetypes.h>
+#include "PCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in esfPpc.h */

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h
@@ -2,7 +2,7 @@
 #ifndef _PSP_STUB_VXPPCLIB_H_
 #define _PSP_STUB_VXPPCLIB_H_
 
-#include <PCS_basetypes.h>
+#include "PCS_basetypes.h"
 
 /*
  * When building the coverage test on an actual VxWorks target,

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h b/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h
@@ -12,8 +12,8 @@
 #ifndef _PSP_STUB_BLKIO_H_
 #define _PSP_STUB_BLKIO_H_
 
-#include <PCS_basetypes.h>
-#include <PCS_vxWorks.h>
+#include "PCS_basetypes.h"
+#include "PCS_vxWorks.h"
 
 /* The module and blk_dev types are used in several headers */
 typedef struct PCS_BLK_DEV

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h b/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h
@@ -2,8 +2,8 @@
 #ifndef _PSP_STUB_CACHELIB_H_
 #define _PSP_STUB_CACHELIB_H_
 
-#include <PCS_basetypes.h>
-#include <PCS_vxWorks.h>
+#include "PCS_basetypes.h"
+#include "PCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in cacheLib.h */

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h b/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h
@@ -1,7 +1,7 @@
 #ifndef _PSP_STUB_CFE_CONFIGDATA_H_
 #define _PSP_STUB_CFE_CONFIGDATA_H_
 
-#include <PCS_basetypes.h>
+#include "PCS_basetypes.h"
 
 #define PCS_CONFIG_MISSIONVERSION "UT-mission"
 #define PCS_CONFIG_CFEVERSION "UT-CFE"

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h b/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h
@@ -2,8 +2,8 @@
 #ifndef _PSP_STUB_DOSFSLIB_H_
 #define _PSP_STUB_DOSFSLIB_H_
 
-#include <PCS_basetypes.h>
-#include <PCS_vxWorks.h>
+#include "PCS_basetypes.h"
+#include "PCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in dosFsLib.h */

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h b/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h
@@ -2,10 +2,10 @@
 #ifndef _PSP_STUB_DRV_HDISK_ATADRV_H_
 #define _PSP_STUB_DRV_HDISK_ATADRV_H_
 
-#include <PCS_basetypes.h>
-#include <PCS_vxWorks.h>
-#include <PCS_blkIo.h>
-#include <PCS_xbdBlkDev.h>
+#include "PCS_basetypes.h"
+#include "PCS_vxWorks.h"
+#include "PCS_blkIo.h"
+#include "PCS_xbdBlkDev.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in drv/hdisk/ataDrv.h */

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h b/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h
@@ -2,8 +2,8 @@
 #ifndef _PSP_STUB_ERRNOLIB_H_
 #define _PSP_STUB_ERRNOLIB_H_
 
-#include <PCS_basetypes.h>
-#include <PCS_vxWorks.h>
+#include "PCS_basetypes.h"
+#include "PCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in errnoLib.h */

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_excLib.h b/unit-test-coverage/ut-stubs/inc/PCS_excLib.h
@@ -2,8 +2,8 @@
 #ifndef _PSP_STUB_EXCLIB_H_
 #define _PSP_STUB_EXCLIB_H_
 
-#include <PCS_basetypes.h>
-#include <PCS_taskLib.h>
+#include "PCS_basetypes.h"
+#include "PCS_taskLib.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in excLib.h */

diff --git a/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h b/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h
@@ -2,7 +2,7 @@
 #ifndef _PSP_STUB_FPPLIB_H_
 #define _PSP_STUB_FPPLIB_H_
 
-#include <PCS_basetypes.h>
+#include "PCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in fppLib.h */