diff --git a/release/build.info b/release/build.info index d757a46..c6f0499 100644 --- a/release/build.info +++ b/release/build.info @@ -1,2 +1,2 @@ -201 +203 diff --git a/release/version.info b/release/version.info index 6e1f4db..70a52fd 100644 --- a/release/version.info +++ b/release/version.info @@ -1,2 +1,2 @@ -2.0.0 +2.0.1 diff --git a/src/cmock.c b/src/cmock.c index 97571a0..e26243a 100644 --- a/src/cmock.c +++ b/src/cmock.c @@ -85,8 +85,8 @@ CMOCK_MEM_INDEX_TYPE CMock_Guts_MemNew(CMOCK_MEM_INDEX_TYPE size) //------------------------------------------------------- CMOCK_MEM_INDEX_TYPE CMock_Guts_MemChain(CMOCK_MEM_INDEX_TYPE root_index, CMOCK_MEM_INDEX_TYPE obj_index) { - CMOCK_MEM_INDEX_TYPE index; - void* root; + CMOCK_MEM_INDEX_TYPE index; + void* root; void* obj; void* next; @@ -98,16 +98,16 @@ CMOCK_MEM_INDEX_TYPE CMock_Guts_MemChain(CMOCK_MEM_INDEX_TYPE root_index, CMOCK_ else { //reject illegal nodes - if ((root_index < CMOCK_MEM_ALIGN_SIZE) || (root_index >= CMock_Guts_FreePtr)) + if ((root_index < CMOCK_MEM_ALIGN_SIZE) || (root_index >= CMock_Guts_FreePtr)) { - return CMOCK_GUTS_NONE; + return CMOCK_GUTS_NONE; } - if ((obj_index < CMOCK_MEM_ALIGN_SIZE) || (obj_index >= CMock_Guts_FreePtr)) + if ((obj_index < CMOCK_MEM_ALIGN_SIZE) || (obj_index >= CMock_Guts_FreePtr)) { - return CMOCK_GUTS_NONE; - } - - root = (void*)(&CMock_Guts_Buffer[root_index]); + return CMOCK_GUTS_NONE; + } + + root = (void*)(&CMock_Guts_Buffer[root_index]); obj = (void*)(&CMock_Guts_Buffer[obj_index]); //find the end of the existing chain and add us @@ -129,37 +129,37 @@ CMOCK_MEM_INDEX_TYPE CMock_Guts_MemChain(CMOCK_MEM_INDEX_TYPE root_index, CMOCK_ //------------------------------------------------------- CMOCK_MEM_INDEX_TYPE CMock_Guts_MemNext(CMOCK_MEM_INDEX_TYPE previous_item_index) { - CMOCK_MEM_INDEX_TYPE index; + CMOCK_MEM_INDEX_TYPE index; void* previous_item; //There is nothing "next" if the pointer isn't from our buffer if ((previous_item_index < CMOCK_MEM_ALIGN_SIZE) || (previous_item_index >= CMock_Guts_FreePtr)) - return CMOCK_GUTS_NONE; + return CMOCK_GUTS_NONE; previous_item = (void*)(&CMock_Guts_Buffer[previous_item_index]); - //if the pointer is good, then use it to look up the next index + //if the pointer is good, then use it to look up the next index //(we know the first element always goes in zero, so NEXT must always be > 1) index = *(CMOCK_MEM_INDEX_TYPE*)((CMOCK_MEM_PTR_AS_INT)previous_item - CMOCK_MEM_INDEX_SIZE); if ((index > 1) && (index < CMock_Guts_FreePtr)) return index; else return CMOCK_GUTS_NONE; -} +} //------------------------------------------------------- // CMock_GetAddressFor -//------------------------------------------------------- -void* CMock_Guts_GetAddressFor(CMOCK_MEM_INDEX_TYPE index) -{ - if ((index >= CMOCK_MEM_ALIGN_SIZE) && (index < CMock_Guts_FreePtr)) - { - return (void*)(&CMock_Guts_Buffer[index]); - } - else - { - return NULL; - } -} +//------------------------------------------------------- +void* CMock_Guts_GetAddressFor(CMOCK_MEM_INDEX_TYPE index) +{ + if ((index >= CMOCK_MEM_ALIGN_SIZE) && (index < CMock_Guts_FreePtr)) + { + return (void*)(&CMock_Guts_Buffer[index]); + } + else + { + return NULL; + } +} //------------------------------------------------------- // CMock_Guts_MemBytesFree diff --git a/src/cmock.h b/src/cmock.h index 6d5f894..084a828 100644 --- a/src/cmock.h +++ b/src/cmock.h @@ -5,23 +5,23 @@ ========================================== */ #ifndef CMOCK_FRAMEWORK_H -#define CMOCK_FRAMEWORK_H +#define CMOCK_FRAMEWORK_H //should be big enough to index full range of CMOCK_MEM_MAX #ifndef CMOCK_MEM_INDEX_TYPE #define CMOCK_MEM_INDEX_TYPE unsigned int -#endif - -#define CMOCK_GUTS_NONE (0) +#endif + +#define CMOCK_GUTS_NONE (0) //------------------------------------------------------- // Memory API //------------------------------------------------------- CMOCK_MEM_INDEX_TYPE CMock_Guts_MemNew(CMOCK_MEM_INDEX_TYPE size); CMOCK_MEM_INDEX_TYPE CMock_Guts_MemChain(CMOCK_MEM_INDEX_TYPE root_index, CMOCK_MEM_INDEX_TYPE obj_index); -CMOCK_MEM_INDEX_TYPE CMock_Guts_MemNext(CMOCK_MEM_INDEX_TYPE previous_item_index); - -void* CMock_Guts_GetAddressFor(CMOCK_MEM_INDEX_TYPE index); +CMOCK_MEM_INDEX_TYPE CMock_Guts_MemNext(CMOCK_MEM_INDEX_TYPE previous_item_index); + +void* CMock_Guts_GetAddressFor(CMOCK_MEM_INDEX_TYPE index); CMOCK_MEM_INDEX_TYPE CMock_Guts_MemBytesFree(void); CMOCK_MEM_INDEX_TYPE CMock_Guts_MemBytesUsed(void);