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

Merge pull request #254 from jsalling/cleanup/clang-format

Browse Source 
Formatting source code to existing style
This commit is contained in:
Mark VanderVoord
2017-01-19 06:56:35 -05:00
committed by GitHub
parent a3fe04f6a4 97e4bd252a
commit 78938f6f05
2 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,9 +5,9 @@
* [Released under MIT License. Please refer to license.txt for details]
* ========================================== */
#include <string.h>
#include "unity_fixture.h"
#include "unity_internals.h"
#include <string.h>
struct UNITY_FIXTURE_T UnityFixture;
@@ -71,7 +71,8 @@ void UnityTestRunner(unityfunction* setup,
const char* printableName,
const char* group,
const char* name,
const char* file, unsigned int line)
const char* file,
unsigned int line)
{
if (testSelected(name) && groupSelected(group))
{
@@ -198,7 +199,7 @@ void* unity_malloc(size_t size)
}
else
{
guard = (Guard*) &unity_heap[heap_index];
guard = (Guard*)&unity_heap[heap_index];
heap_index += total_size;
}
#else
@@ -395,7 +396,9 @@ int UnityGetCommandLineOptions(int argc, const char* argv[])
i++;
}
}
} else {
}
else
{
/* ignore unknown parameter */
i++;
}

41
src/unity.c
View File

@@ -180,8 +180,7 @@ void UnityPrintNumberUnsigned(const UNITY_UINT number)
{
UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10)));
divisor /= 10;
}
while (divisor > 0);
} while (divisor > 0);
}
/*-----------------------------------------------*/
@@ -417,7 +416,9 @@ static void UnityPrintExpectedAndActualStrings(const char* expected, const char*
}
/*-----------------------------------------------*/
static void UnityPrintExpectedAndActualStringsLen(const char* expected, const char* actual, const UNITY_UINT32 length)
static void UnityPrintExpectedAndActualStringsLen(const char* expected,
const char* actual,
const UNITY_UINT32 length)
{
UnityPrint(UnityStrExpected);
if (expected != NULL)
@@ -443,8 +444,6 @@ static void UnityPrintExpectedAndActualStringsLen(const char* expected, const ch
}
}
/*-----------------------------------------------
* Assertion & Control Helpers
*-----------------------------------------------*/
@@ -580,7 +579,7 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
if (expect_val != actual_val)
{
if (style & UNITY_DISPLAY_RANGE_UINT && length < sizeof expect_val)
if (style & UNITY_DISPLAY_RANGE_UINT && length < sizeof(expect_val))
{ /* For UINT, remove sign extension (padding 1's) from signed type casts above */
UNITY_INT mask = 1;
mask = (mask << 8 * length) - 1;
@@ -621,12 +620,11 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
#ifndef UNITY_EXCLUDE_FLOAT_PRINT
#define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
do { \
{ \
UnityPrint(UnityStrExpected); \
UnityPrintFloat(expected); \
UnityPrint(UnityStrWas); \
UnityPrintFloat(actual); \
} while(0)
UnityPrintFloat(actual); }
#else
#define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
UnityPrint(UnityStrDelta)
@@ -700,14 +698,14 @@ void UnityAssertFloatSpecial(const UNITY_FLOAT actual,
const UNITY_LINE_TYPE lineNumber,
const UNITY_FLOAT_TRAIT_T style)
{
const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet };
const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
UNITY_INT is_trait = !should_be_trait;
UNITY_INT trait_index = (UNITY_INT)(style >> 1);
RETURN_IF_FAIL_OR_IGNORE;
switch(style)
switch (style)
{
case UNITY_FLOAT_IS_INF:
case UNITY_FLOAT_IS_NOT_INF:
@@ -826,14 +824,14 @@ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
const UNITY_LINE_TYPE lineNumber,
const UNITY_FLOAT_TRAIT_T style)
{
const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet };
const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
UNITY_INT is_trait = !should_be_trait;
UNITY_INT trait_index = (UNITY_INT)(style >> 1);
RETURN_IF_FAIL_OR_IGNORE;
switch(style)
switch (style)
{
case UNITY_FLOAT_IS_INF:
case UNITY_FLOAT_IS_NOT_INF:
@@ -880,11 +878,10 @@ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
}
}
#endif /* not UNITY_EXCLUDE_DOUBLE */
/*-----------------------------------------------*/
void UnityAssertNumbersWithin( const UNITY_UINT delta,
void UnityAssertNumbersWithin(const UNITY_UINT delta,
const UNITY_INT expected,
const UNITY_INT actual,
const char* msg,
@@ -1001,9 +998,8 @@ void UnityAssertEqualStringLen(const char* expected,
}
}
/*-----------------------------------------------*/
void UnityAssertEqualStringArray( const char** expected,
void UnityAssertEqualStringArray(const char** expected,
const char** actual,
const UNITY_UINT32 num_elements,
const char* msg,
@@ -1061,7 +1057,7 @@ void UnityAssertEqualStringArray( const char** expected,
}
/*-----------------------------------------------*/
void UnityAssertEqualMemory( UNITY_INTERNAL_PTR expected,
void UnityAssertEqualMemory(UNITY_INTERNAL_PTR expected,
UNITY_INTERNAL_PTR actual,
const UNITY_UINT32 length,
const UNITY_UINT32 num_elements,
@@ -1171,9 +1167,9 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
UNITY_WEAK_ATTRIBUTE void setUp(void) { }
UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
#elif defined(UNITY_WEAK_PRAGMA)
# pragma weak setUp
#pragma weak setUp
void setUp(void) { }
# pragma weak tearDown
#pragma weak tearDown
void tearDown(void) { }
#endif
/*-----------------------------------------------*/
@@ -1259,7 +1255,7 @@ int UnityParseOptions(int argc, char** argv)
{
if (argv[i][0] == '-')
{
switch(argv[i][1])
switch (argv[i][1])
{
case 'l': /* list tests */
return -1;
@@ -1364,7 +1360,8 @@ int UnityStringArgumentMatches(const char* str)
/* look for the start of the next partial */
ptr2 = ptr1;
ptrf = 0;
do {
do
{
ptr2++;
if ((ptr2[0] == ':') && (ptr2[1] != 0) && (ptr2[0] != '\'') && (ptr2[0] != '"') && (ptr2[0] != ','))
ptrf = &ptr2[1];