From b4ed613595432ece6802d09bfabad18e09aa26f3 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 1 Oct 2020 04:25:54 +0000 Subject: Import nvi 2.2.0-05ed8b9 This snapshot just brings a bunch of fixes in particular a fix for vi -w PR: 241985 Reported by: fernape --- common/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/log.c') diff --git a/common/log.c b/common/log.c index 5dcd9a2945fc..96b246efad02 100644 --- a/common/log.c +++ b/common/log.c @@ -69,10 +69,10 @@ static int apply_with(int (*)(SCR *, recno_t, CHAR_T *, size_t), SCR *, recno_t, u_char *, size_t); /* Try and restart the log on failure, i.e. if we run out of memory. */ -#define LOG_ERR { \ +#define LOG_ERR do { \ log_err(sp, __FILE__, __LINE__); \ return (1); \ -} +} while (0) /* offset of CHAR_T string in log needs to be aligned on some systems * because it is passed to db_set as a string -- cgit v1.2.3