Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
bc153881
Unverified
Commit
bc153881
authored
Jan 28, 2019
by
Antonio Niño Díaz
Committed by
GitHub
Jan 28, 2019
Browse files
Merge pull request #1778 from JoelHutton/jh/multiconsole
multi_console: Check functions are not NULL
parents
7ca572d9
e84c8713
Changes
1
Hide whitespace changes
Inline
Side-by-side
drivers/console/multi_console.c
View file @
bc153881
/*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2018
-2019
, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
...
...
@@ -76,7 +76,7 @@ int console_putc(int c)
console_t
*
console
;
for
(
console
=
console_list
;
console
!=
NULL
;
console
=
console
->
next
)
if
(
console
->
flags
&
console_state
)
{
if
(
(
console
->
flags
&
console_state
)
&&
console
->
putc
)
{
int
ret
=
console
->
putc
(
c
,
console
);
if
((
err
==
ERROR_NO_VALID_CONSOLE
)
||
(
ret
<
err
))
err
=
ret
;
...
...
@@ -93,7 +93,7 @@ int console_getc(void)
do
{
/* Keep polling while at least one console works correctly. */
for
(
console
=
console_list
;
console
!=
NULL
;
console
=
console
->
next
)
if
(
console
->
flags
&
console_state
)
{
if
(
(
console
->
flags
&
console_state
)
&&
console
->
getc
)
{
int
ret
=
console
->
getc
(
console
);
if
(
ret
>=
0
)
return
ret
;
...
...
@@ -111,7 +111,7 @@ int console_flush(void)
console_t
*
console
;
for
(
console
=
console_list
;
console
!=
NULL
;
console
=
console
->
next
)
if
(
console
->
flags
&
console_state
)
{
if
(
(
console
->
flags
&
console_state
)
&&
console
->
flush
)
{
int
ret
=
console
->
flush
(
console
);
if
((
err
==
ERROR_NO_VALID_CONSOLE
)
||
(
ret
<
err
))
err
=
ret
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment