Favor usage of __func__ in warning/error messages. Some of them referred to the

wrong function and fix the rest for consistency.
Diff from Michael W. Bombardieri with some cosmetic cleanup applied.

ok benno@ tb@

13 files changed, 80 insertions, 84 deletions

diff --git a/bin/ksh/c_ksh.c b/bin/ksh/c_ksh.c
index a78b7da12e9..87aedf611d7 100644
--- a/bin/ksh/c_ksh.c
+++ b/bin/ksh/c_ksh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_ksh.c,v 1.58 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: c_ksh.c,v 1.59 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  * built-in Korn commands: c_*
@@ -1273,7 +1273,7 @@ c_getopts(char **wp)
 	}
 
 	if (genv->loc->next == NULL) {
-		internal_warningf("c_getopts: no argv");
+		internal_warningf("%s: no argv", __func__);
 		return 1;
 	}
 	/* Which arguments are we parsing... */
diff --git a/bin/ksh/c_ulimit.c b/bin/ksh/c_ulimit.c
index 1ce0b66577c..2dd36672ac8 100644
--- a/bin/ksh/c_ulimit.c
+++ b/bin/ksh/c_ulimit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_ulimit.c,v 1.26 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: c_ulimit.c,v 1.27 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
 	ulimit -- handle "ulimit" builtin
@@ -97,7 +97,7 @@ c_ulimit(char **wp)
 			for (l = limits; l->name && l->option != optc; l++)
 				;
 			if (!l->name) {
-				internal_warningf("ulimit: %c", optc);
+				internal_warningf("%s: %c", __func__, optc);
 				return 1;
 			}
 			if (builtin_opt.optarg) {
diff --git a/bin/ksh/edit.c b/bin/ksh/edit.c
index 9cfaa197d6a..d9ccc4a22d3 100644
--- a/bin/ksh/edit.c
+++ b/bin/ksh/edit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: edit.c,v 1.63 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: edit.c,v 1.64 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  * Command line editing - common code
@@ -372,7 +372,7 @@ x_file_glob(int flags, const char *str, int slen, char ***wordsp)
 	source = s;
 	if (yylex(ONEWORD|UNESCAPE) != LWORD) {
 		source = sold;
-		internal_warningf("fileglob: substitute error");
+		internal_warningf("%s: substitute error", __func__);
 		return 0;
 	}
 	source = sold;
diff --git a/bin/ksh/exec.c b/bin/ksh/exec.c
index a53ba5fdfdb..1d274919fcb 100644
--- a/bin/ksh/exec.c
+++ b/bin/ksh/exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.c,v 1.72 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: exec.c,v 1.73 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  * execute command tree
@@ -727,7 +727,7 @@ shcomexec(char **wp)
 
 	tp = ktsearch(&builtins, *wp, hash(*wp));
 	if (tp == NULL)
-		internal_errorf("shcomexec: %s", *wp);
+		internal_errorf("%s: %s", __func__, *wp);
 	return call_builtin(tp, wp);
 }
 
@@ -1221,7 +1221,7 @@ herein(const char *content, int sub)
 		s->start = s->str = content;
 		source = s;
 		if (yylex(ONEWORD|HEREDOC) != LWORD)
-			internal_errorf("herein: yylex");
+			internal_errorf("%s: yylex", __func__);
 		source = osource;
 		shf_puts(evalstr(yylval.cp, 0), shf);
 	} else
@@ -1446,5 +1446,5 @@ static void
 dbteste_error(Test_env *te, int offset, const char *msg)
 {
 	te->flags |= TEF_ERROR;
-	internal_warningf("dbteste_error: %s (offset %d)", msg, offset);
+	internal_warningf("%s: %s (offset %d)", __func__, msg, offset);
 }
diff --git a/bin/ksh/jobs.c b/bin/ksh/jobs.c
index f437fe69c68..ba738663390 100644
--- a/bin/ksh/jobs.c
+++ b/bin/ksh/jobs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: jobs.c,v 1.59 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: jobs.c,v 1.60 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  * Process and job control
@@ -199,14 +199,13 @@ j_suspend(void)
 		tcsetattr(tty_fd, TCSADRAIN, &tty_state);
 		if (restore_ttypgrp >= 0) {
 			if (tcsetpgrp(tty_fd, restore_ttypgrp) < 0) {
-				warningf(false,
-				    "j_suspend: tcsetpgrp() failed: %s",
-				    strerror(errno));
+				warningf(false, "%s: tcsetpgrp() failed: %s",
+				    __func__, strerror(errno));
 			} else {
 				if (setpgid(0, restore_ttypgrp) < 0) {
 					warningf(false,
-					    "j_suspend: setpgid() failed: %s",
-					    strerror(errno));
+					    "%s: setpgid() failed: %s",
+					    __func__, strerror(errno));
 				}
 			}
 		}
@@ -224,15 +223,14 @@ j_suspend(void)
 	if (ttypgrp_ok) {
 		if (restore_ttypgrp >= 0) {
 			if (setpgid(0, kshpid) < 0) {
-				warningf(false,
-				    "j_suspend: setpgid() failed: %s",
-				    strerror(errno));
+				warningf(false, "%s: setpgid() failed: %s",
+				    __func__, strerror(errno));
 				ttypgrp_ok = 0;
 			} else {
 				if (tcsetpgrp(tty_fd, kshpid) < 0) {
 					warningf(false,
-					    "j_suspend: tcsetpgrp() failed: %s",
-					    strerror(errno));
+					    "%s: tcsetpgrp() failed: %s",
+					    __func__, strerror(errno));
 					ttypgrp_ok = 0;
 				}
 			}
@@ -309,8 +307,8 @@ j_change(void)
 		ttypgrp_ok = use_tty && tty_fd >= 0 && tty_devtty;
 
 		if (ttypgrp_ok && (our_pgrp = getpgrp()) < 0) {
-			warningf(false, "j_init: getpgrp() failed: %s",
-			    strerror(errno));
+			warningf(false, "%s: getpgrp() failed: %s",
+			    __func__, strerror(errno));
 			ttypgrp_ok = 0;
 		}
 		if (ttypgrp_ok) {
@@ -322,8 +320,8 @@ j_change(void)
 
 				if ((ttypgrp = tcgetpgrp(tty_fd)) < 0) {
 					warningf(false,
-					    "j_init: tcgetpgrp() failed: %s",
-					    strerror(errno));
+					    "%s: tcgetpgrp() failed: %s",
+					    __func__, strerror(errno));
 					ttypgrp_ok = 0;
 					break;
 				}
@@ -337,15 +335,14 @@ j_change(void)
 			    SS_RESTORE_DFL|SS_FORCE);
 		if (ttypgrp_ok && our_pgrp != kshpid) {
 			if (setpgid(0, kshpid) < 0) {
-				warningf(false,
-				    "j_init: setpgid() failed: %s",
-				    strerror(errno));
+				warningf(false, "%s: setpgid() failed: %s",
+				    __func__, strerror(errno));
 				ttypgrp_ok = 0;
 			} else {
 				if (tcsetpgrp(tty_fd, kshpid) < 0) {
 					warningf(false,
-					    "j_init: tcsetpgrp() failed: %s",
-					    strerror(errno));
+					    "%s: tcsetpgrp() failed: %s",
+					    __func__, strerror(errno));
 					ttypgrp_ok = 0;
 				} else
 					restore_ttypgrp = our_pgrp;
@@ -354,7 +351,8 @@ j_change(void)
 		}
 		if (use_tty) {
 			if (!ttypgrp_ok)
-				warningf(false, "warning: won't have full job control");
+				warningf(false,
+				    "warning: won't have full job control");
 		}
 		if (tty_fd >= 0)
 			tcgetattr(tty_fd, &tty_state);
@@ -411,9 +409,8 @@ exchild(struct op *t, int flags, volatile int *xerrok,
 	/* link process into jobs list */
 	if (flags&XPIPEI) {	/* continuing with a pipe */
 		if (!last_job)
-			internal_errorf(
-			    "exchild: XPIPEI and no last_job - pid %d",
-			    (int) procpid);
+			internal_errorf("%s: XPIPEI and no last_job - pid %d",
+			    __func__, (int) procpid);
 		j = last_job;
 		last_proc->next = p;
 		last_proc = p;
@@ -522,7 +519,7 @@ exchild(struct op *t, int flags, volatile int *xerrok,
 		tty_close();
 		cleartraps();
 		execute(t, (flags & XERROK) | XEXEC, NULL); /* no return */
-		internal_warningf("exchild: execute() returned");
+		internal_warningf("%s: execute() returned", __func__);
 		unwind(LLEAVE);
 		/* NOTREACHED */
 	}
@@ -588,9 +585,9 @@ waitlast(void)
 	j = last_job;
 	if (!j || !(j->flags & JF_STARTED)) {
 		if (!j)
-			warningf(true, "waitlast: no last job");
+			warningf(true, "%s: no last job", __func__);
 		else
-			internal_warningf("waitlast: not started");
+			internal_warningf("%s: not started", __func__);
 		sigprocmask(SIG_SETMASK, &omask, NULL);
 		return 125; /* not so arbitrary, non-zero value */
 	}
@@ -931,7 +928,7 @@ j_set_async(Job *j)
 	if (async_job && (async_job->flags & (JF_KNOWN|JF_ZOMBIE)) == JF_ZOMBIE)
 		remove_job(async_job, "async");
 	if (!(j->flags & JF_STARTED)) {
-		internal_warningf("j_async: job not started");
+		internal_warningf("%s: job not started", __func__);
 		return;
 	}
 	async_job = j;
@@ -945,8 +942,8 @@ j_set_async(Job *j)
 		if (!oldest) {
 			/* XXX debugging */
 			if (!(async_job->flags & JF_ZOMBIE) || nzombie != 1) {
-				internal_warningf("j_async: bad nzombie (%d)",
-				    nzombie);
+				internal_warningf("%s: bad nzombie (%d)",
+				    __func__, nzombie);
 				nzombie = 0;
 			}
 			break;
@@ -1035,8 +1032,8 @@ j_waitj(Job *j,
 				j->flags |= JF_SAVEDTTYPGRP;
 			if (tcsetpgrp(tty_fd, our_pgrp) < 0) {
 				warningf(true,
-				    "j_waitj: tcsetpgrp(%d, %d) failed: %s",
-				    tty_fd, (int) our_pgrp,
+				    "%s: tcsetpgrp(%d, %d) failed: %s",
+				    __func__, tty_fd, (int)our_pgrp,
 					strerror(errno));
 			}
 			if (j->state == PSTOPPED) {
@@ -1186,8 +1183,8 @@ check_job(Job *j)
 
 	/* XXX debugging (nasty - interrupt routine using shl_out) */
 	if (!(j->flags & JF_STARTED)) {
-		internal_warningf("check_job: job started (flags 0x%x)",
-		    j->flags);
+		internal_warningf("%s: job started (flags 0x%x)",
+		    __func__, j->flags);
 		return;
 	}
 
@@ -1546,7 +1543,7 @@ remove_job(Job *j, const char *where)
 	for (; curr != NULL && curr != j; prev = &curr->next, curr = *prev)
 		;
 	if (curr != j) {
-		internal_warningf("remove_job: job not found (%s)", where);
+		internal_warningf("%s: job not found (%s)", __func__, where);
 		return;
 	}
 	*prev = curr->next;
diff --git a/bin/ksh/main.c b/bin/ksh/main.c
index a162d75069e..62d8180864b 100644
--- a/bin/ksh/main.c
+++ b/bin/ksh/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.89 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: main.c,v 1.90 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  * startup, main loop, environments and error handling
@@ -492,7 +492,7 @@ include(const char *name, int argc, char **argv, int intr_ok)
 			unwind(i);
 			/* NOTREACHED */
 		default:
-			internal_errorf("include: %d", i);
+			internal_errorf("%s: %d", __func__, i);
 			/* NOTREACHED */
 		}
 	}
@@ -579,7 +579,7 @@ shell(Source *volatile s, volatile int toplevel)
 		default:
 			source = old_source;
 			quitenv(NULL);
-			internal_errorf("shell: %d", i);
+			internal_errorf("%s: %d", __func__, i);
 			/* NOTREACHED */
 		}
 	}
diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c
index fab34c12133..7cc5a165c74 100644
--- a/bin/ksh/misc.c
+++ b/bin/ksh/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.68 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: misc.c,v 1.69 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  * Miscellaneous functions
@@ -407,7 +407,7 @@ parse_args(char **argv,
 					break;
 				}
 			if (ele == NELEM(sh_options)) {
-				internal_errorf("parse_args: `%c'", optc);
+				internal_errorf("%s: `%c'", __func__, optc);
 				return -1; /* not reached */
 			}
 		}
diff --git a/bin/ksh/shf.c b/bin/ksh/shf.c
index 693ee1fab6a..98097713360 100644
--- a/bin/ksh/shf.c
+++ b/bin/ksh/shf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shf.c,v 1.32 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: shf.c,v 1.33 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  *  Shell file I/O routines
@@ -100,7 +100,7 @@ shf_fdopen(int fd, int sflags, struct shf *shf)
 	}
 
 	if (!(sflags & (SHF_RD | SHF_WR)))
-		internal_errorf("shf_fdopen: missing read/write");
+		internal_errorf("%s: missing read/write", __func__);
 
 	if (shf) {
 		if (bsize) {
@@ -157,9 +157,9 @@ shf_reopen(int fd, int sflags, struct shf *shf)
 	}
 
 	if (!(sflags & (SHF_RD | SHF_WR)))
-		internal_errorf("shf_reopen: missing read/write");
+		internal_errorf("%s: missing read/write", __func__);
 	if (!shf || !shf->buf || shf->bsize < bsize)
-		internal_errorf("shf_reopen: bad shf/buf/bsize");
+		internal_errorf("%s: bad shf/buf/bsize", __func__);
 
 	/* assumes shf->buf and shf->bsize already set up */
 	shf->fd = fd;
@@ -189,7 +189,7 @@ shf_sopen(char *buf, int bsize, int sflags, struct shf *shf)
 	/* can't have a read+write string */
 	if (!(sflags & (SHF_RD | SHF_WR)) ||
 	    (sflags & (SHF_RD | SHF_WR)) == (SHF_RD | SHF_WR))
-		internal_errorf("shf_sopen: flags 0x%x", sflags);
+		internal_errorf("%s: flags 0x%x", __func__, sflags);
 
 	if (!shf) {
 		shf = alloc(sizeof(struct shf), ATEMP);
@@ -282,7 +282,7 @@ shf_flush(struct shf *shf)
 		return (shf->flags & SHF_WR) ? EOF : 0;
 
 	if (shf->fd < 0)
-		internal_errorf("shf_flush: no fd");
+		internal_errorf("%s: no fd", __func__);
 
 	if (shf->flags & SHF_ERROR) {
 		errno = shf->errno_;
@@ -312,7 +312,7 @@ shf_emptybuf(struct shf *shf, int flags)
 	int ret = 0;
 
 	if (!(shf->flags & SHF_STRING) && shf->fd < 0)
-		internal_errorf("shf_emptybuf: no fd");
+		internal_errorf("%s: no fd", __func__);
 
 	if (shf->flags & SHF_ERROR) {
 		errno = shf->errno_;
@@ -392,7 +392,7 @@ shf_fillbuf(struct shf *shf)
 		return 0;
 
 	if (shf->fd < 0)
-		internal_errorf("shf_fillbuf: no fd");
+		internal_errorf("%s: no fd", __func__);
 
 	if (shf->flags & (SHF_EOF | SHF_ERROR)) {
 		if (shf->flags & SHF_ERROR)
@@ -438,10 +438,10 @@ shf_read(char *buf, int bsize, struct shf *shf)
 	int ncopy;
 
 	if (!(shf->flags & SHF_RD))
-		internal_errorf("shf_read: flags %x", shf->flags);
+		internal_errorf("%s: flags %x", __func__, shf->flags);
 
 	if (bsize <= 0)
-		internal_errorf("shf_read: bsize %d", bsize);
+		internal_errorf("%s: bsize %d", __func__, bsize);
 
 	while (bsize > 0) {
 		if (shf->rnleft == 0 &&
@@ -473,7 +473,7 @@ shf_getse(char *buf, int bsize, struct shf *shf)
 	char *orig_buf = buf;
 
 	if (!(shf->flags & SHF_RD))
-		internal_errorf("shf_getse: flags %x", shf->flags);
+		internal_errorf("%s: flags %x", __func__, shf->flags);
 
 	if (bsize <= 0)
 		return NULL;
@@ -508,7 +508,7 @@ int
 shf_getchar(struct shf *shf)
 {
 	if (!(shf->flags & SHF_RD))
-		internal_errorf("shf_getchar: flags %x", shf->flags);
+		internal_errorf("%s: flags %x", __func__, shf->flags);
 
 	if (shf->rnleft == 0 && (shf_fillbuf(shf) == EOF || shf->rnleft == 0))
 		return EOF;
@@ -523,7 +523,7 @@ int
 shf_ungetc(int c, struct shf *shf)
 {
 	if (!(shf->flags & SHF_RD))
-		internal_errorf("shf_ungetc: flags %x", shf->flags);
+		internal_errorf("%s: flags %x", __func__, shf->flags);
 
 	if ((shf->flags & SHF_ERROR) || c == EOF ||
 	    (shf->rp == shf->buf && shf->rnleft))
@@ -558,7 +558,7 @@ int
 shf_putchar(int c, struct shf *shf)
 {
 	if (!(shf->flags & SHF_WR))
-		internal_errorf("shf_putchar: flags %x", shf->flags);
+		internal_errorf("%s: flags %x", __func__, shf->flags);
 
 	if (c == EOF)
 		return EOF;
@@ -568,7 +568,7 @@ shf_putchar(int c, struct shf *shf)
 		int n;
 
 		if (shf->fd < 0)
-			internal_errorf("shf_putchar: no fd");
+			internal_errorf("%s: no fd", __func__);
 		if (shf->flags & SHF_ERROR) {
 			errno = shf->errno_;
 			return EOF;
@@ -614,10 +614,10 @@ shf_write(const char *buf, int nbytes, struct shf *shf)
 	int ncopy;
 
 	if (!(shf->flags & SHF_WR))
-		internal_errorf("shf_write: flags %x", shf->flags);
+		internal_errorf("%s: flags %x", __func__, shf->flags);
 
 	if (nbytes < 0)
-		internal_errorf("shf_write: nbytes %d", nbytes);
+		internal_errorf("%s: nbytes %d", __func__, nbytes);
 
 	/* Don't buffer if buffer is empty and we're writting a large amount. */
 	if ((ncopy = shf->wnleft) &&
@@ -687,8 +687,8 @@ shf_snprintf(char *buf, int bsize, const char *fmt, ...)
 	int n;
 
 	if (!buf || bsize <= 0)
-		internal_errorf("shf_snprintf: buf %lx, bsize %d",
-			(long) buf, bsize);
+		internal_errorf("%s: buf %lx, bsize %d",
+			__func__, (long) buf, bsize);
 
 	shf_sopen(buf, bsize, SHF_WR, &shf);
 	va_start(args, fmt);
diff --git a/bin/ksh/trap.c b/bin/ksh/trap.c
index d047047cc23..fd4d9b2144b 100644
--- a/bin/ksh/trap.c
+++ b/bin/ksh/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.31 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: trap.c,v 1.32 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  * signal handling
@@ -402,8 +402,8 @@ setexecsig(Trap *p, int restore)
 {
 	/* XXX debugging */
 	if (!(p->flags & (TF_ORIG_IGN|TF_ORIG_DFL)))
-		internal_errorf("setexecsig: unset signal %d(%s)",
-		    p->signal, p->name);
+		internal_errorf("%s: unset signal %d(%s)",
+		    __func__, p->signal, p->name);
 
 	/* restore original value for exec'd kids */
 	p->flags &= ~(TF_EXEC_IGN|TF_EXEC_DFL);
diff --git a/bin/ksh/tree.c b/bin/ksh/tree.c
index 5d58db66cef..172a416a097 100644
--- a/bin/ksh/tree.c
+++ b/bin/ksh/tree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.c,v 1.32 2018/01/20 15:32:20 anton Exp $	*/
+/*	$OpenBSD: tree.c,v 1.33 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  * command tree climbing
@@ -533,8 +533,8 @@ wdscan(const char *wp, int c)
 			break;
 		default:
 			internal_warningf(
-			    "wdscan: unknown char 0x%x (carrying on)",
-			    wp[-1]);
+			    "%s: unknown char 0x%x (carrying on)",
+			    __func__, wp[-1]);
 		}
 }
 
diff --git a/bin/ksh/tty.c b/bin/ksh/tty.c
index 648bdb7a48b..e93b0a5d1dd 100644
--- a/bin/ksh/tty.c
+++ b/bin/ksh/tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.c,v 1.16 2015/12/14 13:59:42 tb Exp $	*/
+/*	$OpenBSD: tty.c,v 1.17 2018/03/15 16:51:29 anton Exp $	*/
 
 #include <errno.h>
 #include <fcntl.h>
@@ -50,8 +50,8 @@ tty_init(int init_ttystate)
 		}
 	}
 	if ((tty_fd = fcntl(tfd, F_DUPFD_CLOEXEC, FDBASE)) < 0) {
-		warningf(false, "j_ttyinit: dup of tty fd failed: %s",
-		    strerror(errno));
+		warningf(false, "%s: dup of tty fd failed: %s",
+		    __func__, strerror(errno));
 	} else if (init_ttystate)
 		tcgetattr(tty_fd, &tty_state);
 	if (do_close)
diff --git a/bin/ksh/var.c b/bin/ksh/var.c
index 96c745e705d..6761358b953 100644
--- a/bin/ksh/var.c
+++ b/bin/ksh/var.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: var.c,v 1.65 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: var.c,v 1.66 2018/03/15 16:51:29 anton Exp $	*/
 
 #include <sys/stat.h>
 
@@ -366,9 +366,8 @@ setstr(struct tbl *vq, const char *s, int error_ok)
 			/* debugging */
 			if (s >= vq->val.s &&
 			    s <= vq->val.s + strlen(vq->val.s))
-				internal_errorf(
-				    "setstr: %s=%s: assigning to self",
-				    vq->name, s);
+				internal_errorf("%s: %s=%s: assigning to self",
+				    __func__, vq->name, s);
 			afree(vq->val.s, vq->areap);
 		}
 		vq->flag &= ~(ISSET|ALLOC);
diff --git a/bin/ksh/vi.c b/bin/ksh/vi.c
index d0bd785a461..12202d5c3d3 100644
--- a/bin/ksh/vi.c
+++ b/bin/ksh/vi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vi.c,v 1.55 2018/01/16 22:52:32 jca Exp $	*/
+/*	$OpenBSD: vi.c,v 1.56 2018/03/15 16:51:29 anton Exp $	*/
 
 /*
  *	vi command editing
@@ -1669,7 +1669,7 @@ grabhist(int save, int n)
 	}
 	(void) histnum(n);
 	if ((hptr = *histpos()) == NULL) {
-		internal_warningf("grabhist: bad history array");
+		internal_warningf("%s: bad history array", __func__);
 		return -1;
 	}
 	if (save)