From c37197ea5eda6b17c6b38a8f1326e1b582aff6bd Mon Sep 17 00:00:00 2001 From: Chris Knight Date: Fri, 5 Jun 2020 12:37:31 -0700 Subject: [PATCH 1/4] fix #730 - adds null to FILEDEFs --- fsw/cfe-core/src/inc/cfe_tbl_filedef.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fsw/cfe-core/src/inc/cfe_tbl_filedef.h b/fsw/cfe-core/src/inc/cfe_tbl_filedef.h index d5552bb4f..b5ff17dc8 100644 --- a/fsw/cfe-core/src/inc/cfe_tbl_filedef.h +++ b/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)}; /*************************************************************************/ From 5903b84f4711e6bed5e918074b519c4898e7dd21 Mon Sep 17 00:00:00 2001 From: JandlynBentley-at-NASA <65973939+JandlynBentley-at-NASA@users.noreply.github.com> Date: Tue, 23 Jun 2020 15:23:42 -0400 Subject: [PATCH 2/4] Fix #604, Added cFE User's Guide Reference to README.md (#742) * Fix #604, Add a reference to cFE User's Guide to cFE README.md This reference was placed toward the top of the document, before the Version History section. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c4dbcbca9..574b25dc8 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ 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 , which includes build and execution instructions. +The detailed cFE user's guide can be viewed at . + ## Version History ### Development Build: 6.7.20 From 968fcd703b280d4dea768fcb83c67473b0cccf82 Mon Sep 17 00:00:00 2001 From: skliper <47541139+skliper@users.noreply.github.com> Date: Wed, 24 Jun 2020 09:12:49 -0400 Subject: [PATCH 3/4] Fix #754, Remove obsolete license (#755) --- cmake/sample_defs/default_osconfig.cmake | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cmake/sample_defs/default_osconfig.cmake b/cmake/sample_defs/default_osconfig.cmake index 4cc04b976..e2767e689 100644 --- a/cmake/sample_defs/default_osconfig.cmake +++ b/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 From 5d9e5fecf6f1a4574cf9ae4394ba0507814e9925 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 24 Jun 2020 21:46:19 -0400 Subject: [PATCH 4/4] Increase version to 6.7.21 and update Readme --- README.md | 9 ++++++++- fsw/cfe-core/src/inc/cfe_version.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 574b25dc8..9d0a71685 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,16 @@ The detailed cFE user's guide can be viewed at + ### 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 ### Development Build: 6.7.19 diff --git a/fsw/cfe-core/src/inc/cfe_version.h b/fsw/cfe-core/src/inc/cfe_version.h index b967be642..10844e7d0 100644 --- a/fsw/cfe-core/src/inc/cfe_version.h +++ b/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_ */