Merge pull request #756 from nasa/integration-candidate

Integration Candidate: 2020-06-17

README.md

@@ -6,11 +6,20 @@ This repository contains NASA's Core Flight Executive (cFE), which is a framewor
 
 This is a collection of services and associated framework to be located in the `cfe` subdirectory of a cFS Mission Tree. The Core Flight System is bundled at <https://github.com/nasa/cFS>, which includes build and execution instructions.
 
+The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob/gh-pages/cFE_Users_Guide.pdf>.
+
 ## Version History
 
+### Development Build: 6.7.21
+
+- If a string is exactly the size of the field when using the `CFE_TBL_FILEDEF()` macro it will produce a compiler error
+- Added cFE User's Guide Reference to README.md
+- Removes old license
+- See <https://github.com/nasa/cFE/pull/743>
+
 ### Development Build: 6.7.20
 
--  SB Unit use of the UT assert framework is closer to original design intent
+- SB Unit use of the UT assert framework is closer to original design intent
 - See <https://github.com/nasa/cFE/pull/743>
 
 ### Development Build: 6.7.19

cmake/sample_defs/default_osconfig.cmake

@@ -1,15 +1,3 @@
-#
-# 
-#    Copyright (c) 2020, United States government as represented by the
-#    administrator of the National Aeronautics Space Administration.
-#    All rights reserved. This software was created at NASA Goddard
-#    Space Flight Center pursuant to government contracts.
-# 
-#    This is governed by the NASA Open Source Agreement and may be used,
-#    distributed and modified only according to the terms of that agreement.
-# 
-#
-
 ##########################################################################
 #
 # CFE configuration options for OSAL

fsw/cfe-core/src/inc/cfe_tbl_filedef.h

@@ -68,6 +68,12 @@ typedef struct
 } CFE_TBL_FileDef_t;
 
 /** The CFE_TBL_FILEDEF macro can be used to simplify the declaration of a table image when using the elf2cfetbl utility.
+**
+**  Note that the macro adds a NULL at the end to ensure that it is null-terminated. (C allows
+**  a struct to be statically initialized with a string exactly the length of the array, which
+**  loses the null terminator.) This means the actual length limit of the fields are the above
+**  LEN - 1.
+**
 **  An example of the source code and how this macro would be used is as follows: \code
  
     #include "cfe_tbl_filedef.h"
@@ -87,7 +93,7 @@ typedef struct
 \endcode
 */
 
-#define CFE_TBL_FILEDEF(ObjName, TblName, Desc, Filename) static OS_USED CFE_TBL_FileDef_t CFE_TBL_FileDef={#ObjName, #TblName, #Desc, #Filename, sizeof(ObjName)};
+#define CFE_TBL_FILEDEF(ObjName, TblName, Desc, Filename) static OS_USED CFE_TBL_FileDef_t CFE_TBL_FileDef={#ObjName "\0", #TblName "\0", #Desc "\0", #Filename "\0", sizeof(ObjName)};
 
 /*************************************************************************/
 

fsw/cfe-core/src/inc/cfe_version.h

@@ -95,7 +95,7 @@
 */
 #define CFE_MAJOR_VERSION         6
 #define CFE_MINOR_VERSION         7
-#define CFE_REVISION              20
+#define CFE_REVISION              21
 
 
 #endif  /* _cfe_version_ */