From 488dbc264d015d42b3f58dfaf193c567720c8b11 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Wed, 14 Jul 2021 09:53:11 -0400 Subject: [PATCH] Fix #1662, remove default .dat extension Do not enforce/add a default extension to binary data files --- modules/fs/fsw/src/cfe_fs_api.c | 4 ---- modules/fs/ut-coverage/fs_UT.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/fs/fsw/src/cfe_fs_api.c b/modules/fs/fsw/src/cfe_fs_api.c index 3b5d034b8..81615f45c 100644 --- a/modules/fs/fsw/src/cfe_fs_api.c +++ b/modules/fs/fsw/src/cfe_fs_api.c @@ -43,7 +43,6 @@ * Fixed default file system extensions (not platform dependent) */ const char CFE_FS_DEFAULT_SCRIPT_EXTENSION[] = ".scr"; -const char CFE_FS_DEFAULT_DUMP_FILE_EXTENSION[] = ".dat"; const char CFE_FS_DEFAULT_TEMP_FILE_EXTENSION[] = ".tmp"; const char CFE_FS_DEFAULT_LOG_FILE_EXTENSION[] = ".log"; @@ -105,9 +104,6 @@ const char *CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_t FileCategory) case CFE_FS_FileCategory_TEMP: Result = CFE_FS_DEFAULT_TEMP_FILE_EXTENSION; break; - case CFE_FS_FileCategory_BINARY_DATA_DUMP: - Result = CFE_FS_DEFAULT_DUMP_FILE_EXTENSION; - break; case CFE_FS_FileCategory_TEXT_LOG: Result = CFE_FS_DEFAULT_LOG_FILE_EXTENSION; break; diff --git a/modules/fs/ut-coverage/fs_UT.c b/modules/fs/ut-coverage/fs_UT.c index 19d6f6e19..79affdcf3 100644 --- a/modules/fs/ut-coverage/fs_UT.c +++ b/modules/fs/ut-coverage/fs_UT.c @@ -407,7 +407,7 @@ void Test_CFE_FS_DefaultFileStrings(void) UtAssert_NULL(CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_UNKNOWN)); UtAssert_ADDRESS_EQ(CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_DYNAMIC_MODULE), GLOBAL_CONFIGDATA.Default_ModuleExtension); - UtAssert_NOT_NULL(CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_BINARY_DATA_DUMP)); + UtAssert_NULL(CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_BINARY_DATA_DUMP)); UtAssert_NOT_NULL(CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_TEXT_LOG)); UtAssert_NOT_NULL(CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_SCRIPT)); UtAssert_NOT_NULL(CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_TEMP));