1 files changed, 13 insertions, 26 deletions

diff --git a/src/third_party/wiredtiger/src/support/err.c b/src/third_party/wiredtiger/src/support/err.c
index 8bfac250b3a..3ecbab1cbe9 100644
--- a/src/third_party/wiredtiger/src/support/err.c
+++ b/src/third_party/wiredtiger/src/support/err.c
@@ -162,7 +162,6 @@ __wt_eventv(WT_SESSION_IMPL *session, bool msg_event, int error,
 	WT_SESSION *wt_session;
 	struct timespec ts;
 	size_t len, remain, wlen;
-	int prefix_cnt;
 	const char *err, *prefix;
 	char *end, *p, tid[128];
 
@@ -211,44 +210,32 @@ __wt_eventv(WT_SESSION_IMPL *session, bool msg_event, int error,
 	 * name, and the session's name.  Write them as a comma-separate list,
 	 * followed by a colon.
 	 */
-	prefix_cnt = 0;
-	if (__wt_epoch(session, &ts) == 0) {
-		__wt_thread_id(tid, sizeof(tid));
-		remain = WT_PTRDIFF(end, p);
-		wlen = (size_t)snprintf(p, remain,
-		    "[%" PRIuMAX ":%" PRIuMAX "][%s]",
-		    (uintmax_t)ts.tv_sec,
-		    (uintmax_t)ts.tv_nsec / WT_THOUSAND, tid);
-		p = wlen >= remain ? end : p + wlen;
-		prefix_cnt = 1;
-	}
+	__wt_epoch(session, &ts);
+	__wt_thread_id(tid, sizeof(tid));
+	remain = WT_PTRDIFF(end, p);
+	wlen = (size_t)snprintf(p, remain, "[%" PRIuMAX ":%" PRIuMAX "][%s]",
+	    (uintmax_t)ts.tv_sec, (uintmax_t)ts.tv_nsec / WT_THOUSAND, tid);
+	p = wlen >= remain ? end : p + wlen;
+
 	if ((prefix = S2C(session)->error_prefix) != NULL) {
 		remain = WT_PTRDIFF(end, p);
-		wlen = (size_t)snprintf(p, remain,
-		    "%s%s", prefix_cnt == 0 ? "" : ", ", prefix);
+		wlen = (size_t)snprintf(p, remain, ", %s", prefix);
 		p = wlen >= remain ? end : p + wlen;
-		prefix_cnt = 1;
 	}
 	prefix = session->dhandle == NULL ? NULL : session->dhandle->name;
 	if (prefix != NULL) {
 		remain = WT_PTRDIFF(end, p);
-		wlen = (size_t)snprintf(p, remain,
-		    "%s%s", prefix_cnt == 0 ? "" : ", ", prefix);
+		wlen = (size_t)snprintf(p, remain, ", %s", prefix);
 		p = wlen >= remain ? end : p + wlen;
-		prefix_cnt = 1;
 	}
 	if ((prefix = session->name) != NULL) {
 		remain = WT_PTRDIFF(end, p);
-		wlen = (size_t)snprintf(p, remain,
-		    "%s%s", prefix_cnt == 0 ? "" : ", ", prefix);
-		p = wlen >= remain ? end : p + wlen;
-		prefix_cnt = 1;
-	}
-	if (prefix_cnt != 0) {
-		remain = WT_PTRDIFF(end, p);
-		wlen = (size_t)snprintf(p, remain, ": ");
+		wlen = (size_t)snprintf(p, remain, ", %s", prefix);
 		p = wlen >= remain ? end : p + wlen;
 	}
+	remain = WT_PTRDIFF(end, p);
+	wlen = (size_t)snprintf(p, remain, ": ");
+	p = wlen >= remain ? end : p + wlen;
 
 	if (file_name != NULL) {
 		remain = WT_PTRDIFF(end, p);