Merge pull request #1853 from jphickey/fix-1850-pool-bounds-err

Fix #1850, remove unused CFE_ES_POOL_BOUNDS_ERROR
nasa · Aug 20, 2021 · d00bce1 · d00bce1
2 parents d5f6670 + 369696a
commit d00bce1
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/modules/core_api/fsw/inc/cfe_error.h b/modules/core_api/fsw/inc/cfe_error.h
@@ -600,15 +600,6 @@ typedef int32 CFE_Status_t;
  */
 #define CFE_ES_POOL_BLOCK_INVALID ((CFE_Status_t)0xc400002C)
 
-/**
- * @brief Invalid pool size or buffer address
- *
- *  A specified pool address or size is outside the acceptable
- *  bounds for that pool configuration.
- *
- */
-#define CFE_ES_POOL_BOUNDS_ERROR ((CFE_Status_t)0xc400002D)
-
 /**
  * @brief Duplicate Name Error
  *

diff --git a/modules/core_api/fsw/inc/cfe_es.h b/modules/core_api/fsw/inc/cfe_es.h
@@ -1309,7 +1309,6 @@ CFE_Status_t CFE_ES_PoolCreate(CFE_ES_MemHandle_t *PoolID, void *MemPtr, size_t
 ** \retval #CFE_SUCCESS                       \copybrief CFE_SUCCESS
 ** \retval #CFE_ES_BAD_ARGUMENT               \copybrief CFE_ES_BAD_ARGUMENT
 ** \retval #CFE_ES_NO_RESOURCE_IDS_AVAILABLE  \copybrief CFE_ES_NO_RESOURCE_IDS_AVAILABLE
-** \retval #CFE_ES_POOL_BOUNDS_ERROR          \copybrief CFE_ES_POOL_BOUNDS_ERROR
 ** \retval #CFE_STATUS_EXTERNAL_RESOURCE_FAIL \copybrief CFE_STATUS_EXTERNAL_RESOURCE_FAIL
 **
 ** \sa #CFE_ES_PoolCreate, #CFE_ES_PoolCreateNoSem, #CFE_ES_GetPoolBuf, #CFE_ES_PutPoolBuf, #CFE_ES_GetMemPoolStats

diff --git a/modules/es/fsw/src/cfe_es_mempool.c b/modules/es/fsw/src/cfe_es_mempool.c
@@ -350,11 +350,6 @@ CFE_Status_t CFE_ES_PoolCreateEx(CFE_ES_MemHandle_t *PoolID, void *MemPtr, size_
          */
         CFE_ES_MemPoolRecordSetFree(PoolRecPtr);
         PendingID = CFE_RESOURCEID_UNDEFINED;
-
-        if (Status == CFE_ES_POOL_BOUNDS_ERROR)
-        {
-            CFE_ES_WriteToSysLog("%s: Pool size(%lu) too small\n", __func__, (unsigned long)Size);
-        }
     }
 
     /*