diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2018-08-13 15:46:37 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2018-08-13 15:46:37 +1000 |
| commit | ec6f2a54d8b901e95e556d53647944be8ce441d5 (patch) | |
| tree | a75c521f1918cf0343acf2ced1669567e2a7b854 /src/third_party/wiredtiger/src/support/err.c | |
| parent | 1c52af393ebc9040fbc300293835f68f827304ce (diff) | |
| download | mongo-ec6f2a54d8b901e95e556d53647944be8ce441d5.tar.gz | |
Import wiredtiger: c91b80412603f283532e267893f9238dd4a5ec0f from branch mongodb-4.2
ref: 65531924e3..c91b804126
for: 4.1.2
WT-3856 Create a test that runs recovery to different points of time with schema operations
WT-4026 Add implementation for existing file extension configuration API
WT-4193 test/format snapshot-isolation search mismatch
WT-4194 Improve fairness of eviction with multiple tables
WT-4207 Coverity #1394567: null pointer dereference
WT-4210 schema abort child process failing prematurely
WT-4215 Allow recovery of backup without salvage
WT-4229 Lint
WT-4234 Remove documentation mention of legacy tool statlog.py
WT-4235 Fix workgen tracking of table state across workloads
WT-4242 New log file extension Python test failure
Diffstat (limited to 'src/third_party/wiredtiger/src/support/err.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/support/err.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/third_party/wiredtiger/src/support/err.c b/src/third_party/wiredtiger/src/support/err.c index 1c6cd8e50ae..33dc1a0a0d4 100644 --- a/src/third_party/wiredtiger/src/support/err.c +++ b/src/third_party/wiredtiger/src/support/err.c @@ -174,7 +174,7 @@ __wt_event_handler_set(WT_SESSION_IMPL *session, WT_EVENT_HANDLER *handler) */ static int __eventv(WT_SESSION_IMPL *session, bool msg_event, int error, - const char *func_name, int line_number, const char *fmt, va_list ap) + const char *func, int line, const char *fmt, va_list ap) WT_GCC_FUNC_ATTRIBUTE((cold)) { struct timespec ts; @@ -231,8 +231,8 @@ __eventv(WT_SESSION_IMPL *session, bool msg_event, int error, WT_ERROR_APPEND(p, remain, ", %s", prefix); WT_ERROR_APPEND(p, remain, ": "); - if (func_name != NULL) - WT_ERROR_APPEND(p, remain, "%s, %d: ", func_name, line_number); + if (func != NULL) + WT_ERROR_APPEND(p, remain, "%s, %d: ", func, line); WT_ERROR_APPEND_AP(p, remain, fmt, ap); @@ -314,7 +314,7 @@ err: if (fprintf(stderr, */ void __wt_err_func(WT_SESSION_IMPL *session, - int error, const char *func_name, int line_number, const char *fmt, ...) + int error, const char *func, int line, const char *fmt, ...) WT_GCC_FUNC_ATTRIBUTE((cold)) WT_GCC_FUNC_ATTRIBUTE((format (printf, 5, 6))) WT_GCC_FUNC_ATTRIBUTE((visibility("default"))) @@ -326,8 +326,7 @@ __wt_err_func(WT_SESSION_IMPL *session, * an error value to return. */ va_start(ap, fmt); - WT_IGNORE_RET(__eventv(session, - false, error, func_name, line_number, fmt, ap)); + WT_IGNORE_RET(__eventv(session, false, error, func, line, fmt, ap)); va_end(ap); } @@ -337,7 +336,7 @@ __wt_err_func(WT_SESSION_IMPL *session, */ void __wt_errx_func(WT_SESSION_IMPL *session, - const char *func_name, int line_number, const char *fmt, ...) + const char *func, int line, const char *fmt, ...) WT_GCC_FUNC_ATTRIBUTE((cold)) WT_GCC_FUNC_ATTRIBUTE((format (printf, 4, 5))) WT_GCC_FUNC_ATTRIBUTE((visibility("default"))) @@ -349,8 +348,7 @@ __wt_errx_func(WT_SESSION_IMPL *session, * an error value to return. */ va_start(ap, fmt); - WT_IGNORE_RET(__eventv(session, - false, 0, func_name, line_number, fmt, ap)); + WT_IGNORE_RET(__eventv(session, false, 0, func, line, fmt, ap)); va_end(ap); } |