From owner-svn-src-head@freebsd.org Tue Sep 1 22:02:55 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EFF8B37DDA8; Tue, 1 Sep 2020 22:02:55 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1KC66HTz4cBw; Tue, 1 Sep 2020 22:02:55 +0000 (UTC) (envelope-from mjg@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 B55DB205DD; Tue, 1 Sep 2020 22:02:55 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M2tdS054838; Tue, 1 Sep 2020 22:02:55 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M2tVB054837; Tue, 1 Sep 2020 22:02:55 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012202.081M2tVB054837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:02:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365188 - head/sys/dev/nvram2env X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/nvram2env X-SVN-Commit-Revision: 365188 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.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:02:56 -0000 Author: mjg Date: Tue Sep 1 22:02:55 2020 New Revision: 365188 URL: https://svnweb.freebsd.org/changeset/base/365188 Log: nvram2env: clean up empty lines in .c and .h files Modified: head/sys/dev/nvram2env/nvram2env.c head/sys/dev/nvram2env/nvram2env.h Modified: head/sys/dev/nvram2env/nvram2env.c ============================================================================== --- head/sys/dev/nvram2env/nvram2env.c Tue Sep 1 22:02:32 2020 (r365187) +++ head/sys/dev/nvram2env/nvram2env.c Tue Sep 1 22:02:55 2020 (r365188) @@ -87,7 +87,6 @@ nvram2env_probe(device_t dev) &sc->flags) != 0 || sc->flags == 0) sc->flags = NVRAM_FLAGS_GENERIC; - for (i = 0; i < 2; i ++) { switch (i) { @@ -160,7 +159,6 @@ static uint32_t read_4(struct nvram2env_softc * sc, in return (bus_space_read_4(sc->bst, sc->bsh, offset)); } - int nvram2env_attach(device_t dev) { @@ -187,10 +185,8 @@ nvram2env_attach(device_t dev) size = (size > sc->maxsize)?sc->maxsize:size; - if (sig == sc->sig || (sc->flags & NVRAM_FLAGS_UBOOT)) { - /* align size to 32bit size*/ size += 3; size &= ~3; @@ -229,7 +225,6 @@ nvram2env_attach(device_t dev) /* iterate over buffer till end. tmp points to end of NVRAM */ for ( ; pair < (char*)tmp; pair += strlen(pair) + strlen(value) + 2 ) { - if (!pair || (strlen(pair) == 0)) break; @@ -266,7 +261,6 @@ nvram2env_attach(device_t dev) bootverbose = strtoul(value, 0, 0); if (strcmp(pair, "boothowto" ) == 0) boothowto = strtoul(value, 0, 0); - } free(nv, M_DEVBUF); } Modified: head/sys/dev/nvram2env/nvram2env.h ============================================================================== --- head/sys/dev/nvram2env/nvram2env.h Tue Sep 1 22:02:32 2020 (r365187) +++ head/sys/dev/nvram2env/nvram2env.h Tue Sep 1 22:02:55 2020 (r365188) @@ -27,7 +27,6 @@ * $FreeBSD$ */ - #ifndef NVRAM2ENV_NVRAM2ENV_H_ #define NVRAM2ENV_NVRAM2ENV_H_