Fri Jul 17 02:05:44 2020 UTC ()
Do not recycle loop variable for unrealated purposes.

It just obfuscates the code.  Same object code is generated.


(uwe)
diff -r1.11 -r1.12 src/sys/dev/cninit.c

cvs diff -r1.11 -r1.12 src/sys/dev/cninit.c (expand / switch to unified diff)

--- src/sys/dev/cninit.c 2011/02/08 20:20:26 1.11
+++ src/sys/dev/cninit.c 2020/07/17 02:05:44 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cninit.c,v 1.11 2011/02/08 20:20:26 rmind Exp $ */ 1/* $NetBSD: cninit.c,v 1.12 2020/07/17 02:05:44 uwe Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1988 University of Utah. 4 * Copyright (c) 1988 University of Utah.
5 * Copyright (c) 1990, 1993 5 * Copyright (c) 1990, 1993
6 * The Regents of the University of California. All rights reserved. 6 * The Regents of the University of California. All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to Berkeley by 8 * This code is derived from software contributed to Berkeley by
9 * the Systems Programming Group of the University of Utah Computer 9 * the Systems Programming Group of the University of Utah Computer
10 * Science Department. 10 * Science Department.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE. 34 * SUCH DAMAGE.
35 * 35 *
36 * from: Utah $Hdr: cons.c 1.7 92/01/21$ 36 * from: Utah $Hdr: cons.c 1.7 92/01/21$
37 * 37 *
38 * @(#)cons.c 8.2 (Berkeley) 1/12/94 38 * @(#)cons.c 8.2 (Berkeley) 1/12/94
39 */ 39 */
40 40
41#include <sys/cdefs.h> 41#include <sys/cdefs.h>
42__KERNEL_RCSID(0, "$NetBSD: cninit.c,v 1.11 2011/02/08 20:20:26 rmind Exp $"); 42__KERNEL_RCSID(0, "$NetBSD: cninit.c,v 1.12 2020/07/17 02:05:44 uwe Exp $");
43 43
44#include <sys/param.h> 44#include <sys/param.h>
45#include <sys/proc.h> 45#include <sys/proc.h>
46#include <sys/systm.h> 46#include <sys/systm.h>
47#include <sys/buf.h> 47#include <sys/buf.h>
48#include <sys/ioctl.h> 48#include <sys/ioctl.h>
49#include <sys/tty.h> 49#include <sys/tty.h>
50#include <sys/file.h> 50#include <sys/file.h>
51#include <sys/conf.h> 51#include <sys/conf.h>
52#include <sys/vnode.h> 52#include <sys/vnode.h>
53 53
54#include <dev/cons.h> 54#include <dev/cons.h>
55 55
@@ -61,35 +61,37 @@ cninit(void) @@ -61,35 +61,37 @@ cninit(void)
61 61
62 bestMatch = cn_tab = NULL; 62 bestMatch = cn_tab = NULL;
63 /* 63 /*
64 * Collect information about all possible consoles 64 * Collect information about all possible consoles
65 * and find the one with highest priority 65 * and find the one with highest priority
66 */ 66 */
67 for (cp = constab; cp->cn_probe; cp++) { 67 for (cp = constab; cp->cn_probe; cp++) {
68 (*cp->cn_probe)(cp); 68 (*cp->cn_probe)(cp);
69 if (cp->cn_pri > CN_DEAD && 69 if (cp->cn_pri > CN_DEAD &&
70 (bestMatch == NULL || cp->cn_pri > bestMatch->cn_pri)) { 70 (bestMatch == NULL || cp->cn_pri > bestMatch->cn_pri)) {
71 bestMatch = cp; 71 bestMatch = cp;
72 } 72 }
73 } 73 }
 74
74 /* 75 /*
75 * No console, we can handle it 76 * No console, we can handle it
76 */ 77 */
77 if ((cp = bestMatch) == NULL) 78 if (bestMatch == NULL)
78 return; 79 return;
 80
79 /* 81 /*
80 * Turn on console 82 * Turn on console
81 */ 83 */
82 { 84 {
83 struct consdev *old_cn_tab = cn_tab; 85 struct consdev *old_cn_tab = cn_tab;
84 86
85 (*cp->cn_init)(cp); 87 (*bestMatch->cn_init)(bestMatch);
86 /* 88 /*
87 * Now let everyone know we have an active console they can 89 * Now let everyone know we have an active console they can
88 * use for diagnostics. If we use cn_tab in the search loop 90 * use for diagnostics. If we use cn_tab in the search loop
89 * then interrupts from the ethernet at boot may cause system 91 * then interrupts from the ethernet at boot may cause system
90 * hang. 92 * hang.
91 */ 93 */
92 if (cn_tab == old_cn_tab) 94 if (cn_tab == old_cn_tab)
93 cn_tab = bestMatch; 95 cn_tab = bestMatch;
94 } 96 }
95} 97}