1
0
Fork 0

test(test_suite): modified fctprintf() test case

Renamed 'user' to 'arg'
development
Marco Paland 7 years ago
parent aa9d7a9a54
commit a50f1a8369

@ -51,8 +51,8 @@ int sprintf(char* buffer, const char* format, ...);
int snprintf(char* buffer, size_t count, const char* format, ...);
int vsnprintf(char* buffer, size_t count, const char* format, va_list va);
// call output function (instead of buffer)
int fctprintf(void (*out)(char character, void* user), void* user, const char* format, ...);
// use output function (instead of buffer) for streamlike interface
int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...);
```

@ -77,10 +77,10 @@
typedef void (*out_fct_type)(char character, char* buffer, size_t idx, size_t maxlen);
// wrapper used as buffer
// wrapper (used as buffer) for output function type
typedef struct {
void (*fct)(char character, void* user);
void* user;
void (*fct)(char character, void* arg);
void* arg;
} out_fct_wrap_type;
@ -696,11 +696,11 @@ int vsnprintf(char* buffer, size_t count, const char* format, va_list va)
}
int fctprintf(void (*out)(char character, void* user), void* user, const char* format, ...)
int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...)
{
va_list va;
va_start(va, format);
const out_fct_wrap_type out_fct_wrap = { out, user };
const out_fct_wrap_type out_fct_wrap = { out, arg };
const int ret = _vsnprintf(_out_fct, (char*)&out_fct_wrap, (size_t)-1, format, va);
va_end(va);
return ret;

@ -88,7 +88,7 @@ int vsnprintf(char* buffer, size_t count, const char* format, va_list va);
* \param format A string that specifies the format of the output
* \return The number of characters that are sent to the output function, not counting the terminating null character
*/
int fctprintf(void (*out)(char character, void* user), void* user, const char* format, ...);
int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...);
#ifdef __cplusplus

@ -42,11 +42,18 @@ namespace test {
// dummy putchar
static char printf_buffer[100];
static size_t printf_idx = 0U;
void test::_putchar(char character)
{
printf_buffer[printf_idx++] = character;
}
void _out_fct(char character, void* arg)
{
(void)arg;
printf_buffer[printf_idx++] = character;
}
TEST_CASE("printf", "[]" ) {
@ -60,7 +67,7 @@ TEST_CASE("printf", "[]" ) {
TEST_CASE("fctprintf", "[]" ) {
printf_idx = 0U;
memset(printf_buffer, 0xCC, 100U);
test::fctprintf(&test::_putchar, "This is a test of %X", 0x12EFU);
test::fctprintf(&_out_fct, nullptr, "This is a test of %X", 0x12EFU);
REQUIRE(!strcmp(printf_buffer, "This is a test of 12EF"));
}

Loading…
Cancel
Save