espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-10-18 12:53:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of magic numbers and strlen call for 'end' string in Fixture

Browse Source 
Using sizeof() instead of constant 4, makes code less fragile to change
 Change name of 'guard' in Guard struct to 'guard_space'
This commit is contained in:
jsalling
2015-12-14 16:40:07 -06:00
parent e8662ae1cc
commit f75f489b6e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extras/fixture/src/unity_fixture.c
View File

@ -179,11 +179,11 @@ void UnityMalloc_MakeMallocFailAfterCount(int countdown)
typedef struct GuardBytes
{
size_t size;
char guard[sizeof(size_t)];
char guard_space[4];
} Guard;
static const char * end = "END";
static const char end[] = "END";
void * unity_malloc(size_t size)
{
@ -199,10 +199,10 @@ void * unity_malloc(size_t size)
malloc_count++;
guard = (Guard*)UNITY_FIXTURE_MALLOC(size + sizeof(Guard) + 4);
guard = (Guard*)UNITY_FIXTURE_MALLOC(size + sizeof(Guard) + sizeof(end));
guard->size = size;
mem = (char*)&(guard[1]);
memcpy(&mem[size], end, strlen(end) + 1);
memcpy(&mem[size], end, sizeof(end));
return (void*)mem;
}