===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshlogin.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- src/usr.bin/ssh/sshlogin.c	2019/06/28 13:35:04	1.34
+++ src/usr.bin/ssh/sshlogin.c	2020/10/18 11:32:02	1.35
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshlogin.c,v 1.34 2019/06/28 13:35:04 deraadt Exp $ */
+/* $OpenBSD: sshlogin.c,v 1.35 2020/10/18 11:32:02 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -87,12 +87,12 @@
 	pos = (off_t)uid * sizeof(ll);
 	r = lseek(fd, pos, SEEK_SET);
 	if (r == -1) {
-		error("%s: lseek: %s", __func__, strerror(errno));
+		error_f("lseek: %s", strerror(errno));
 		close(fd);
 		return (0);
 	}
 	if (r != pos) {
-		debug("%s: truncated lastlog", __func__);
+		debug_f("truncated lastlog");
 		close(fd);
 		return (0);
 	}
@@ -135,7 +135,7 @@
 			r = sshbuf_putf(loginmsg, "Last login: %s from %s\r\n",
 			    time_string, hostname);
 		if (r != 0)
-			fatal("%s: buffer error: %s", __func__, ssh_err(r));
+			fatal_fr(r, "sshbuf_putf");
 	}
 }