From owner-svn-src-head@freebsd.org  Fri Jul 13 18:19:34 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A23C51047027;
 Fri, 13 Jul 2018 18:19:34 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 549427214D;
 Fri, 13 Jul 2018 18:19:34 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 360CF13BD3;
 Fri, 13 Jul 2018 18:19:34 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6DIJXYY039827;
 Fri, 13 Jul 2018 18:19:33 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6DIJXRq039826;
 Fri, 13 Jul 2018 18:19:33 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201807131819.w6DIJXRq039826@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 13 Jul 2018 18:19:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336254 - head/stand/libsa/geli
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/stand/libsa/geli
X-SVN-Commit-Revision: 336254
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jul 2018 18:19:34 -0000

Author: imp
Date: Fri Jul 13 18:19:33 2018
New Revision: 336254
URL: https://svnweb.freebsd.org/changeset/base/336254

Log:
  Use if rather than case for a simple boolean. gcc thinks blks is
  undefined sometimes with the case, but enc is always 0 or 1, so
  and if / else is better anyway.

Modified:
  head/stand/libsa/geli/geliboot_crypto.c

Modified: head/stand/libsa/geli/geliboot_crypto.c
==============================================================================
--- head/stand/libsa/geli/geliboot_crypto.c	Fri Jul 13 18:00:13 2018	(r336253)
+++ head/stand/libsa/geli/geliboot_crypto.c	Fri Jul 13 18:19:33 2018	(r336254)
@@ -59,15 +59,14 @@ geliboot_crypt(u_int algo, int enc, u_char *data, size
 			return (err);
 		}
 
-		switch (enc) {
-		case 0: /* decrypt */
+		if (enc == 0) {
+			/* decrypt */
 			blks = rijndael_blockDecrypt(&cipher, &aeskey, data, 
 			    datasize * 8, data);
-			break;
-		case 1: /* encrypt */
+		} else {
+			/* encrypt */
 			blks = rijndael_blockEncrypt(&cipher, &aeskey, data, 
 			    datasize * 8, data);
-			break;
 		}
 		if (datasize != (blks / 8)) {
 			printf("Failed to decrypt the entire input: "