Date: Tue, 1 Sep 2020 22:02:55 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365188 - head/sys/dev/nvram2env Message-ID: <202009012202.081M2tVB054837@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009012202.081M2tVB054837>