From 660a1c820d6c8915bad3241b4a04dce538ebd662 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Sat, 11 Aug 2018 11:28:51 +0000
Subject: [PATCH] Merge ^/head r336870 through r337618.

---
 sbin/ifconfig/ifieee80211.c | 4 ++--
 usr.bin/printf/printf.c     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index e48eb8748e0e..63347ed805e8 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -3529,8 +3529,8 @@ list_scan(int s)
 			idlen = sr->isr_ssid_len;
 		}
 		printf("%-*.*s  %s  %3d  %3dM %4d:%-4d %4d %-4.4s"
-			, IEE80211_NWID_LEN
-			  , copy_essid(ssid, IEE80211_NWID_LEN, idp, idlen)
+			, IEEE80211_NWID_LEN
+			  , copy_essid(ssid, IEEE80211_NWID_LEN, idp, idlen)
 			  , ssid
 			, ether_ntoa((const struct ether_addr *) sr->isr_bssid)
 			, ieee80211_mhz2ieee(sr->isr_freq, sr->isr_flags)
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 024c3f0df0be..94667f381a60 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -388,7 +388,7 @@ printf_doformat(char *fmt, int *rval)
 
 		free(p);
 		if (getout)
-			exit(*rval);
+			return (end_fmt);
 		break;
 	}
 	case 'c': {