Module Name: src
Committed By: roy
Date: Fri Feb 3 16:42:26 UTC 2017
Modified Files:
src/sys/arch/i386/stand/efiboot: boot.c efimemory.c
Log Message:
rows is a uint ... it will always be greater than or equal to 0.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/stand/efiboot/boot.c \
src/sys/arch/i386/stand/efiboot/efimemory.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/efiboot/boot.c
diff -u src/sys/arch/i386/stand/efiboot/boot.c:1.1 src/sys/arch/i386/stand/efiboot/boot.c:1.2
--- src/sys/arch/i386/stand/efiboot/boot.c:1.1 Tue Jan 24 11:09:14 2017
+++ src/sys/arch/i386/stand/efiboot/boot.c Fri Feb 3 16:42:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.1 2017/01/24 11:09:14 nonaka Exp $ */
+/* $NetBSD: boot.c,v 1.2 2017/02/03 16:42:26 roy Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <non...@netbsd.org>
@@ -540,7 +540,7 @@ command_devpath(char *arg)
Print(L"%d:%d:%s\n", DevicePathType(dp), DevicePathSubType(dp), path);
FreePool(path);
- if (rows >= 0 && ++row >= rows) {
+ if (++row >= rows) {
row = 0;
Print(L"Press Any Key to continue :");
(void) awaitkey(-1, 0);
@@ -607,7 +607,7 @@ command_efivar(char *arg)
val ? val : L"(null)");
FreePool(val);
- if (rows >= 0 && ++row >= rows) {
+ if (++row >= rows) {
row = 0;
Print(L"Press Any Key to continue :");
(void) awaitkey(-1, 0);
Index: src/sys/arch/i386/stand/efiboot/efimemory.c
diff -u src/sys/arch/i386/stand/efiboot/efimemory.c:1.1 src/sys/arch/i386/stand/efiboot/efimemory.c:1.2
--- src/sys/arch/i386/stand/efiboot/efimemory.c:1.1 Tue Jan 24 11:09:14 2017
+++ src/sys/arch/i386/stand/efiboot/efimemory.c Fri Feb 3 16:42:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: efimemory.c,v 1.1 2017/01/24 11:09:14 nonaka Exp $ */
+/* $NetBSD: efimemory.c,v 1.2 2017/02/03 16:42:26 roy Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <non...@netbsd.org>
@@ -288,7 +288,7 @@ efi_memory_show_map(bool sorted)
md->Type >= __arraycount(efimemtypes) ?
efimemstr : efimemtypes[md->Type]);
- if (rows >= 0 && ++row >= rows) {
+ if (++row >= rows) {
row = 0;
Print(L"Press Any Key to continue :");
(void) awaitkey(-1, 0);
