diff options
| author | Mattias Andrée <maandree@operamail.com> | 2015-10-13 04:49:15 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2015-10-13 04:49:15 +0200 |
| commit | ec1f0e33c90c4b99bb4dedbf226d48906fb5dba9 (patch) | |
| tree | d1bb1b5ad780fdad13851e5d265816c838aae6c8 /src | |
| parent | info typo (diff) | |
| download | slibc-ec1f0e33c90c4b99bb4dedbf226d48906fb5dba9.tar.gz slibc-ec1f0e33c90c4b99bb4dedbf226d48906fb5dba9.tar.bz2 slibc-ec1f0e33c90c4b99bb4dedbf226d48906fb5dba9.tar.xz | |
CPP directive __func__ requires C99
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
| -rw-r--r-- | src/assert.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/assert.c b/src/assert.c index ffd61a3..8e99052 100644 --- a/src/assert.c +++ b/src/assert.c @@ -28,11 +28,12 @@ /** * The function that is called if an assertion fails. * - * @param expression The expression that failed, `NULL` if `assert_perror` failed - * @param errnum The code of the fatal error, 0 if `assert` failed - * @param file The filename of the source cose whence the assertion was made - * @param line The line in the source code whence the assertion was made - * @param func The function in the source code whence the assertion was made + * @param expression The expression that failed, `NULL` if `assert_perror` failed. + * @param errnum The code of the fatal error, 0 if `assert` failed. + * @param file The filename of the source cose whence the assertion was made. + * @param line The line in the source code whence the assertion was made. + * @param func The function in the source code whence the assertion was made, + * `NULL` if unknown (C99 is required.) */ void __assert_fail(const char* expression, int errnum, const char* file, int line, const char* func) { @@ -42,14 +43,14 @@ void __assert_fail(const char* expression, int errnum, const char* file, int lin _("%(\033[00;01m%)%s%(\033[00m%): " "%(\033[31m%)assertion error%(\033[00m%) " "at line %(\033[33m%)%i%(\033[00m%) " - "of file %(\033[35m%)%s%(\033[00m%), " - "function %(\033[1;34m%)%s%(\033[00m%): " + "of file %(\033[35m%)%s%(\033[00m%)" + "%(, function %(\033[1;34m%)%s%(\033[00m%)%): " "%(\033[31m%)%(exression failed: %)%s%(\033[00m%)\n"), tty, program_invocation_name, tty, tty, tty, tty, line, tty, tty, file, tty, - tty, func, tty, + func != NULL, tty, func, tty, tty, expression != NULL, (expression ? expression : strerror(errnum)), tty); fflush(NULL); /* Flush all streams. */ |