Re: [PATCH v2 6/9] console: remove duplicated test on gd value

On 11/27/20 5:20 AM, Patrick Delaunay wrote:

Reorder test on gd value and remove the duplicated test (!gd) in putc and puts function.

This patch is a preliminary step for rework of this function.

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com

Changes in v2:

• update gd test in console function puts and putc (cosmetic)

  common/console.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/console.c b/common/console.c index 3348436da6..70579af042 100644 --- a/common/console.c +++ b/common/console.c @@ -517,22 +517,22 @@ static inline void print_pre_console_buffer(int flushpoint) {}

void putc(const char c) {

• if (!gd)

• return;
  

  #ifdef CONFIG_SANDBOX /* sandbox can send characters to stdout before it has a console */

• if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {

• if (!(gd->flags & GD_FLG_SERIAL_READY)) { os_putc(c); return; } #endif #ifdef CONFIG_DEBUG_UART /* if we don't have a console yet, use the debug UART */

• if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {

• if (!(gd->flags & GD_FLG_SERIAL_READY)) { printch(c); return; } #endif

• if (!gd)

• return;
  

  #ifdef CONFIG_CONSOLE_RECORD if ((gd->flags & GD_FLG_RECORD) && gd->console_out.start) membuff_putbyte((struct membuff *)&gd->console_out, c);

@@ -565,15 +565,17 @@ void putc(const char c)

void puts(const char *s) {

• if (!gd)

• return;
  

  #ifdef CONFIG_SANDBOX /* sandbox can send characters to stdout before it has a console */

• if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {

• if (!(gd->flags & GD_FLG_SERIAL_READY)) { os_puts(s); return; } #endif #ifdef CONFIG_DEBUG_UART

• if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {

• if (!(gd->flags & GD_FLG_SERIAL_READY)) { while (*s) { int ch = *s++;

@@ -582,8 +584,6 @@ void puts(const char *s) return; } #endif

• if (!gd)

• return;
  

  #ifdef CONFIG_CONSOLE_RECORD if ((gd->flags & GD_FLG_RECORD) && gd->console_out.start) membuff_put((struct membuff *)&gd->console_out, s, strlen(s));

Reviewed-by: Sean Anderson seanga2@gmail.com