diff options
| author | pjd <pjd@FreeBSD.org> | 2011-01-31 15:52:00 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2011-01-31 15:52:00 +0000 |
| commit | 34c6c0a73948c51ae253cd9f5821beeee63cb4ca (patch) | |
| tree | 2843bed5e1f67e7dfeb31348929be32e381aec8a | |
| parent | 7fba0650585e47cf4e320dd6e702355f99a33bd5 (diff) | |
| download | FreeBSD-src-34c6c0a73948c51ae253cd9f5821beeee63cb4ca.zip FreeBSD-src-34c6c0a73948c51ae253cd9f5821beeee63cb4ca.tar.gz | |
Rename pjdlog_verify() to pjdlog_abort() as it better describes what the
the function does and mark it with __dead2.
MFC after: 1 week
| -rw-r--r-- | sbin/hastd/pjdlog.c | 4 | ||||
| -rw-r--r-- | sbin/hastd/pjdlog.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c index bdab802..7739b00 100644 --- a/sbin/hastd/pjdlog.c +++ b/sbin/hastd/pjdlog.c @@ -437,10 +437,10 @@ pjdlog_exitx(int exitcode, const char *fmt, ...) } /* - * Log assertion and exit. + * Log failure message and exit. */ void -pjdlog_verify(const char *func, const char *file, int line, +pjdlog_abort(const char *func, const char *file, int line, const char *failedexpr, const char *fmt, ...) { va_list ap; diff --git a/sbin/hastd/pjdlog.h b/sbin/hastd/pjdlog.h index 2e80e81..0f01f79 100644 --- a/sbin/hastd/pjdlog.h +++ b/sbin/hastd/pjdlog.h @@ -89,22 +89,22 @@ void pjdlogv_exit(int exitcode, const char *fmt, va_list ap) __printflike(2, 0) void pjdlog_exitx(int exitcode, const char *fmt, ...) __printflike(2, 3) __dead2; void pjdlogv_exitx(int exitcode, const char *fmt, va_list ap) __printflike(2, 0) __dead2; -void pjdlog_verify(const char *func, const char *file, int line, - const char *failedexpr, const char *fmt, ...) __printflike(5, 6); +void pjdlog_abort(const char *func, const char *file, int line, + const char *failedexpr, const char *fmt, ...) __printflike(5, 6) __dead2; #define PJDLOG_VERIFY(expr) do { \ if (!(expr)) { \ - pjdlog_verify(__func__, __FILE__, __LINE__, #expr, \ + pjdlog_abort(__func__, __FILE__, __LINE__, #expr, \ __func__); \ } \ } while (0) #define PJDLOG_RVERIFY(expr, ...) do { \ if (!(expr)) { \ - pjdlog_verify(__func__, __FILE__, __LINE__, #expr, \ + pjdlog_abort(__func__, __FILE__, __LINE__, #expr, \ __VA_ARGS__); \ } \ } while (0) -#define PJDLOG_ABORT(...) pjdlog_verify(__func__, __FILE__, \ +#define PJDLOG_ABORT(...) pjdlog_abort(__func__, __FILE__, \ __LINE__, NULL, __VA_ARGS__) #ifdef NDEBUG #define PJDLOG_ASSERT(expr) do { } while (0) |
