Bump to v1.2.0-rc1+dev19

Also apply clang-format
nasa · Feb 16, 2021 · edcf316 · edcf316
1 parent 8cbfcd3
commit edcf316
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,13 @@ This lab application is a ground utility to generate binary table CRCs for cFS.
 
 ## Version Notes
 
+### Development Build: 1.2.0-rc1+dev19
+
+- Changes CLI "help" option to use two dashes: `--help`
+- Adds static analysis and format check to continuous integration workflow. Adds workflow status badges to ReadMe.
+- Adds CodeQL Analysis to continuous integration workflow.
+- See <https://github.com/nasa/tblCRCTool/pull/35>
+
 ### Development Build: 1.2.0-rc1+dev12
 
 - Documentation: Add `Security.md` with instructions on reporting vulnerabilities

diff --git a/cfe_ts_crc.c b/cfe_ts_crc.c
@@ -98,7 +98,6 @@ uint32 CalculateCRC(void *DataPtr, uint32 DataLength, uint32 InputCRC)
     }
 
     return (Crc);
-
 }
 
 int main(int argc, char **argv)

diff --git a/cfe_ts_crc_version.h b/cfe_ts_crc_version.h
@@ -31,7 +31,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_TS_CRC_BUILD_NUMBER 12 /*!< @brief Number of commits since baseline */
+#define CFE_TS_CRC_BUILD_NUMBER 19 /*!< @brief Number of commits since baseline */
 #define CFE_TS_CRC_BUILD_BASELINE \
     "v1.2.0+dev" /*!< @brief Development Build: git tag that is the base for the current */
 
@@ -40,9 +40,11 @@
  */
 #define CFE_TS_CRC_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
 #define CFE_TS_CRC_MINOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
-#define CFE_TS_CRC_REVISION      99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased development version.  */
+#define CFE_TS_CRC_REVISION                                                                                           \
+    99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased \
+          development version.  */
 
-#define CFE_TS_CRC_MISSION_REV   0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
+#define CFE_TS_CRC_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
 
 /*
  * Tools to construct version string
@@ -61,10 +63,10 @@
  * @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
  * official version. @n See @ref cfsversions for format differences between development and release versions.
  */
-#define CFE_TS_CRC_VERSION_STRING                                               \
-    " cFE TS CRC calculator (tblCRCtool) \n"                                    \
-    " DEVELOPMENT BUILD \n"                                                     \
-    " " CFE_TS_CRC_VERSION " \n"                                                \
-    " Last Offical Release: tblCRCtool v3.1.0"     /* For full support please use official release version */
+#define CFE_TS_CRC_VERSION_STRING            \
+    " cFE TS CRC calculator (tblCRCtool) \n" \
+    " DEVELOPMENT BUILD \n"                  \
+    " " CFE_TS_CRC_VERSION " \n"             \
+    " Last Offical Release: tblCRCtool v3.1.0" /* For full support please use official release version */
 
 #endif /* CFE_TS_CRC_VERSION_H */
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         return (Crc);
     }
     int main(int argc, char **argv)
@@ Expand Down @@