diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2016-08-16 14:20:09 +0100 |
|---|---|---|
| committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2016-08-16 14:22:48 +0100 |
| commit | 11e977bc8486d65ba3964e4523ed19105736701a (patch) | |
| tree | 1611b60f394cf2b7df7c6a260413ee241376fa45 /framework | |
| parent | 2d7b255223625e203b5ab520ee86892bf80a411d (diff) | |
Use __func__ instead of __FUNCTION__
__FUNCTION__ is not compliant with the ISO C standard. Recent Linaro
toolchains (e.g. 5.3) report uses of __FUNCTION__ as an error when
building with --pedantic (which is the case in TFTF).
This patch replaces all uses of __FUNCTION__ by __func__ (introduced
in the C99 standard).
Change-Id: I7cb2a23fb33a2f5dd170878ecc3743ef6d63aa7f
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/nvm_results_helpers.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/nvm_results_helpers.c b/framework/nvm_results_helpers.c index b4c7bc6..3e8c41e 100644 --- a/framework/nvm_results_helpers.c +++ b/framework/nvm_results_helpers.c @@ -226,9 +226,9 @@ int tftf_testcase_printf(const char *format, ...) available = sizeof(testcase_output) - testcase_output_idx; if (available == 0) { ERROR("%s: Output buffer is full ; the string won't be printed.\n", - __FUNCTION__); + __func__); ERROR("%s: Consider increasing TESTCASE_OUTPUT_MAX_SIZE value.\n", - __FUNCTION__); + __func__); goto release_lock; } @@ -238,7 +238,7 @@ int tftf_testcase_printf(const char *format, ...) va_end(ap); if (written < 0) { - ERROR("%s: Output error (%d)", __FUNCTION__, written); + ERROR("%s: Output error (%d)", __func__, written); goto release_lock; } /* @@ -253,9 +253,9 @@ int tftf_testcase_printf(const char *format, ...) */ if (written >= available) { ERROR("%s: String has been truncated (%u/%u bytes written).\n", - __FUNCTION__, available - 1, written); + __func__, available - 1, written); ERROR("%s: Consider increasing TESTCASE_OUTPUT_MAX_SIZE value.\n", - __FUNCTION__); + __func__); written = available - 1; } |