d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: cstyle cleanup of console.c

Browse Source 
cstyle cleanup only, no functional changes intended.
This commit is contained in:
Toomas Soome 2020-11-14 10:56:40 +00:00
parent 146e176df7
commit 3e9f0f1d29
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=367674
1 changed files with 182 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
stand/common/console.c
View File

@ -54,7 +54,8 @@ cons_probe(void)
char *prefconsole;
/* We want a callback to install the new value when this var changes. */
env_setenv("twiddle_divisor", EV_VOLATILE, "1", twiddle_set, env_nounset);
env_setenv("twiddle_divisor", EV_VOLATILE, "1", twiddle_set,
env_nounset);
/* Do all console probes */
for (cons = 0; consoles[cons] != NULL; cons++) {
@ -106,13 +107,16 @@ getchar(void)
int rv;
/* Loop forever polling all active consoles */
for(;;)
for (cons = 0; consoles[cons] != NULL; cons++)
if ((consoles[cons]->c_flags & (C_PRESENTIN | C_ACTIVEIN)) ==
for (;;) {
for (cons = 0; consoles[cons] != NULL; cons++) {
if ((consoles[cons]->c_flags &
(C_PRESENTIN | C_ACTIVEIN)) ==
(C_PRESENTIN | C_ACTIVEIN) &&
((rv = consoles[cons]->c_in()) != -1))
return (rv);
}
}
}
int
ischar(void)
@ -136,11 +140,12 @@ putchar(int c)
if (c == '\n')
putchar('\r');
for (cons = 0; consoles[cons] != NULL; cons++)
for (cons = 0; consoles[cons] != NULL; cons++) {
if ((consoles[cons]->c_flags & (C_PRESENTOUT | C_ACTIVEOUT)) ==
(C_PRESENTOUT | C_ACTIVEOUT))
consoles[cons]->c_out(c);
}
}
/*
* Find the console with the specified name.
@ -151,7 +156,7 @@ cons_find(const char *name)
int cons;
for (cons = 0; consoles[cons] != NULL; cons++)
if (!strcmp(consoles[cons]->c_name, name))
if (strcmp(consoles[cons]->c_name, name) == 0)
return (cons);
return (-1);
}
@ -166,8 +171,9 @@ cons_set(struct env_var *ev, int flags, const void *value)
if ((value == NULL) || (cons_check(value) == 0)) {
/*
* Return CMD_OK instead of CMD_ERROR to prevent forth syntax error,
* which would prevent it processing any further loader.conf entries.
* Return CMD_OK instead of CMD_ERROR to prevent forth syntax
* error, which would prevent it processing any further
* loader.conf entries.
*/
return (CMD_OK);
}
@ -243,15 +249,20 @@ cons_change(const char *string)
if (cons >= 0) {
consoles[cons]->c_flags |= C_ACTIVEIN | C_ACTIVEOUT;
consoles[cons]->c_init(0);
if ((consoles[cons]->c_flags & (C_PRESENTIN | C_PRESENTOUT)) ==
if ((consoles[cons]->c_flags &
(C_PRESENTIN | C_PRESENTOUT)) ==
(C_PRESENTIN | C_PRESENTOUT)) {
active++;
continue;
}
if (active != 0) {
/* If no consoles have initialised we wouldn't see this. */
printf("console %s failed to initialize\n", consoles[cons]->c_name);
/*
* If no consoles have initialised we
* wouldn't see this.
*/
printf("console %s failed to initialize\n",
consoles[cons]->c_name);
}
}
}
@ -259,7 +270,10 @@ cons_change(const char *string)
free(dup);
if (active == 0) {
/* All requested consoles failed to initialise, try to recover. */
/*
* All requested consoles failed to initialise,
* try to recover.
*/
for (cons = 0; consoles[cons] != NULL; cons++) {
consoles[cons]->c_flags |= C_ACTIVEIN | C_ACTIVEOUT;
consoles[cons]->c_init(0);