Merge pull request #121 from nasa/integration-candidate

elf2cfetbl Integration candidate: Caelum-rc4+dev26
nasa · Oct 17, 2022 · 46b29f8 · 46b29f8
2 parents f060751 + f0faed4
commit 46b29f8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v3.3.0-rc4+dev30
+- Remove C++-style comments
+- See <https://github.com/nasa/elf2cfetbl/pull/119>
+
 ## Development Build: v3.3.0-rc4+dev26
 - Create CHANGELOG.md
 - See <https://github.com/nasa/elf2cfetbl/pull/117>

diff --git a/elf2cfetbl.c b/elf2cfetbl.c
@@ -350,7 +350,7 @@ ElfStrMap e_machine_Map[] = {
     {0, "* Unknown Machine Type (%d) *"},
 };
 
-// Elf Header helper functions
+/* Elf Header helper functions */
 uint8_t get_e_ident(const union Elf_Ehdr *ElfHeaderLcl, int index)
 {
     if (TargetWordsizeIs32Bit)
@@ -423,7 +423,7 @@ uint16_t get_e_shnum(const union Elf_Ehdr *ElfHeaderLcl)
     }
 }
 
-// Elf Section Header helper functions
+/* Elf Section Header helper functions */
 
 uint32_t get_sh_name(const union Elf_Shdr *SectionHeader)
 {
@@ -530,7 +530,7 @@ uint64_t get_sh_entsize(const union Elf_Shdr *SectionHeader)
     }
 }
 
-// Elf_Sym helper functions
+/* Elf_Sym helper functions */
 
 uint32_t get_st_name(const union Elf_Sym *Symbol)
 {

diff --git a/elf2cfetbl_version.h b/elf2cfetbl_version.h
@@ -28,7 +28,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define ELF2CFETBL_BUILD_NUMBER 26 /*!< @brief Number of commits since baseline */
+#define ELF2CFETBL_BUILD_NUMBER 30 /*!< @brief Number of commits since baseline */
 #define ELF2CFETBL_BUILD_BASELINE \
     "v3.3.0-rc4" /*!< @brief Development Build: git tag that is the base for the current */