Merge pull request #78 from nasa/integration-candidate

tblCRCTool Integration candidate: Caelum-rc4+dev40
nasa · Feb 27, 2023 · 0d2eda4 · 0d2eda4
2 parents 9abe3a7 + 1bf28d1
commit 0d2eda4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## Development Build: v1.3.0+rc4+dev24
+## Develop,ent Build: v1.3.0-rc4+dev28
+- Replace exit(1) with preferred macro EXIT_FAILURE
+- See <https://github.com/nasa/tblCRCTool/pull/77>
+
+## Development Build: v1.3.0-rc4+dev24
 - Create CHANGELOG.md
 - See <https://github.com/nasa/tblCRCTool/pull/73>
 

diff --git a/cfe_ts_crc.c b/cfe_ts_crc.c
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
     {
         printf("%s\n", CFE_TS_CRC_VERSION_STRING);
         printf("\nUsage: cfe_ts_crc [filename]\n");
-        exit(1);
+        exit(EXIT_FAILURE);
     }
     /* Set to skip the header (116 bytes) */
     skipSize = sizeof(CFE_FS_Header_t) + sizeof(CFE_TBL_File_Hdr_t);
@@ -125,15 +125,15 @@ int main(int argc, char **argv)
     {
         printf("\ncfe_ts_crc error: can't open input file!\n");
         perror(argv[1]);
-        exit(1);
+        exit(EXIT_FAILURE);
     }
     /* seek past the number of bytes requested */
     offsetReturn = lseek(fd, skipSize, SEEK_SET);
     if (offsetReturn != skipSize)
     {
         printf("\ncfe_ts_crc error: lseek failed!\n");
         printf("%s\n", strerror(errno));
-        exit(1);
+        exit(EXIT_FAILURE);
     }
 
     /* read the input file 100 bytes at a time */
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
         {
             printf("\ncfe_ts_crc error: file read failed!\n");
             printf("%s\n", strerror(errno));
-            exit(1);
+            exit(EXIT_FAILURE);
         }
         fileCRC = CalculateCRC(buffer, readSize, fileCRC);
         fileSize += readSize;
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
     {
         printf("\nerror: Cannot close file!\n");
         printf("%s\n", strerror(errno));
-        exit(1);
+        exit(EXIT_FAILURE);
     }
 
     return 0;

diff --git a/cfe_ts_crc_version.h b/cfe_ts_crc_version.h
@@ -29,7 +29,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_TS_CRC_BUILD_NUMBER 24 /*!< @brief Number of commits since baseline */
+#define CFE_TS_CRC_BUILD_NUMBER 28 /*!< @brief Number of commits since baseline */
 #define CFE_TS_CRC_BUILD_BASELINE \
     "v1.3.0-rc4+dev" /*!< @brief Development Build: git tag that is the base for the current */