From scottr/NetBSD. Minor style cleanup (avoid goto); no functional change.
From scottr/NetBSD.
Minor style cleanup (avoid goto); no functional change.

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars