From 4abb091d26289c4a705593cf561e43dc8f864459 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 09:49:26 -0600 Subject: [PATCH 1/2] Fix #105, Remove old copyright headers --- ELF_Structures.h | 21 --------------------- SampleTblImg.c | 22 ---------------------- elf2cfetbl.c | 32 ++++---------------------------- elf2cfetbl_version.h | 20 -------------------- 4 files changed, 4 insertions(+), 91 deletions(-) diff --git a/ELF_Structures.h b/ELF_Structures.h index 7bf947a..05a52be 100644 --- a/ELF_Structures.h +++ b/ELF_Structures.h @@ -1,24 +1,3 @@ -/* -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -** -*/ #ifndef ELF_STRUCTURES_H #define ELF_STRUCTURES_H diff --git a/SampleTblImg.c b/SampleTblImg.c index eaa2e7c..d30ccf7 100644 --- a/SampleTblImg.c +++ b/SampleTblImg.c @@ -1,25 +1,3 @@ -/* -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -** -*/ - #include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */ /* diff --git a/elf2cfetbl.c b/elf2cfetbl.c index 877fdd7..bb27ea1 100644 --- a/elf2cfetbl.c +++ b/elf2cfetbl.c @@ -1,31 +1,7 @@ -/* -** -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -** -** -** Purpose: -** This file implements the ELF file to Standard cFE Table file format tool -** -** Notes: -** -** -*/ +/** + * \file + * This file implements the ELF file to Standard cFE Table file format tool + */ /* ** Required header files. diff --git a/elf2cfetbl_version.h b/elf2cfetbl_version.h index b525179..9b6e35a 100644 --- a/elf2cfetbl_version.h +++ b/elf2cfetbl_version.h @@ -1,23 +1,3 @@ -/* -** GSC-18128-1, "Core Flight Executive Version 6.7" -** -** Copyright (c) 2006-2019 United States Government as represented by -** the Administrator of the National Aeronautics and Space Administration. -** All Rights Reserved. -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - /*! @file * @brief Purpose: * @details Provide version identifiers for the ELF to cFE Table Converter. @n From 4466a8d9b226c8c6c8ce24b37eb662b56da17755 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 23 Mar 2022 12:42:58 -0600 Subject: [PATCH 2/2] Fix #105, Add new copyright header --- ELF_Structures.h | 18 ++++++++++++++++++ SampleTblImg.c | 18 ++++++++++++++++++ elf2cfetbl.c | 18 ++++++++++++++++++ elf2cfetbl_version.h | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/ELF_Structures.h b/ELF_Structures.h index 05a52be..6b8df79 100644 --- a/ELF_Structures.h +++ b/ELF_Structures.h @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + #ifndef ELF_STRUCTURES_H #define ELF_STRUCTURES_H diff --git a/SampleTblImg.c b/SampleTblImg.c index d30ccf7..715cb6d 100644 --- a/SampleTblImg.c +++ b/SampleTblImg.c @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + #include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */ /* diff --git a/elf2cfetbl.c b/elf2cfetbl.c index bb27ea1..8622251 100644 --- a/elf2cfetbl.c +++ b/elf2cfetbl.c @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + /** * \file * This file implements the ELF file to Standard cFE Table file format tool diff --git a/elf2cfetbl_version.h b/elf2cfetbl_version.h index 9b6e35a..acb697f 100644 --- a/elf2cfetbl_version.h +++ b/elf2cfetbl_version.h @@ -1,3 +1,21 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + /*! @file * @brief Purpose: * @details Provide version identifiers for the ELF to cFE Table Converter. @n