c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-23 02:44:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move libspl_assertf into .c file

Browse Source 
Variadic functions cannot be inlined. libspl_assertf ends up being
duplicated in every file that uses it.

Fix this by moving the function into a new assert.c. Also move the
definition of aok into the new file instead of zone.c.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10538
This commit is contained in:
Arvind Sankar
2020-07-04 18:24:13 -04:00
committed by Brian Behlendorf
parent 2054f35e56
commit b6437ea41c
6 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libspl/include/assert.h
+7 -26
View File
@@ -33,37 +33,18 @@
#include <stdlib.h>
#include <stdarg.h>
#ifndef _KERNEL
/* Set to non-zero to avoid abort()ing on an assertion failure */
extern int aok;
#endif
/* printf version of libspl_assert */
extern void libspl_assertf(const char *file, const char *func, int line,
const char *format, ...);
static inline int
libspl_assert(const char *buf, const char *file, const char *func, int line)
{
fprintf(stderr, "%s\n", buf);
fprintf(stderr, "ASSERT at %s:%d:%s()", file, line, func);
if (aok) {
return (0);
}
abort();
}
/* printf version of libspl_assert */
static inline void
libspl_assertf(const char *file, const char *func, int line,
const char *format, ...)
{
va_list args;
va_start(args, format);
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
fprintf(stderr, "ASSERT at %s:%d:%s()", file, line, func);
va_end(args);
if (aok) {
return;
}
abort();
libspl_assertf(file, func, line, "%s", buf);
return (0);
}
#ifdef verify