[PATCH v2] kdb: kdb_main: refactor code in kdb_md_line

[PATCH v2] kdb: kdb_main: refactor code in kdb_md_line

[Gustavo A. R. Silva]

Replace the whole switch statement with a for loop.
This makes the code much clear and easy to read.

This also addresses the following Coverity warnings:

Addresses-Coverity-ID: 115090 ("Missing break in switch")
Addresses-Coverity-ID: 115091 ("Missing break in switch")
Addresses-Coverity-ID: 114700 ("Missing break in switch")

Suggested-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
Changes in v2:
 - Add new variable j and use it for the for loop.

 kernel/debug/kdb/kdb_main.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 2ddfce8..a9ad288 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -1493,6 +1493,7 @@ static void kdb_md_line(const char *fmtstr, unsigned long addr,
 	char cbuf[32];
 	char *c = cbuf;
 	int i;
+	int j;
 	unsigned long word;
 
 	memset(cbuf, '\0', sizeof(cbuf));
@@ -1538,25 +1539,9 @@ static void kdb_md_line(const char *fmtstr, unsigned long addr,
 			wc.word = word;
 #define printable_char(c) \
 	({unsigned char __c = c; isascii(__c) && isprint(__c) ? __c : '.'; })
-			switch (bytesperword) {
-			case 8:
+			for (j = 0; j < bytesperword; j++)
 				*c++ = printable_char(*cp++);
-				*c++ = printable_char(*cp++);
-				*c++ = printable_char(*cp++);
-				*c++ = printable_char(*cp++);
-				addr += 4;
-			case 4:
-				*c++ = printable_char(*cp++);
-				*c++ = printable_char(*cp++);
-				addr += 2;
-			case 2:
-				*c++ = printable_char(*cp++);
-				addr++;
-			case 1:
-				*c++ = printable_char(*cp++);
-				addr++;
-				break;
-			}
+			addr += bytesperword;
 #undef printable_char
 		}
 	}
-- 
2.7.4

Re: [PATCH v2] kdb: kdb_main: refactor code in kdb_md_line

[Daniel Thompson]

On Thu, Aug 16, 2018 at 09:01:41AM -0500, Gustavo A. R. Silva wrote:
> Replace the whole switch statement with a for loop.
> This makes the code much clear and easy to read.
> 
> This also addresses the following Coverity warnings:
> 
> Addresses-Coverity-ID: 115090 ("Missing break in switch")
> Addresses-Coverity-ID: 115091 ("Missing break in switch")
> Addresses-Coverity-ID: 114700 ("Missing break in switch")
> 
> Suggested-by: Daniel Thompson <daniel.thompson@linaro.org>
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>

Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>

> ---
> Changes in v2:
>  - Add new variable j and use it for the for loop.
> 
>  kernel/debug/kdb/kdb_main.c | 21 +++------------------
>  1 file changed, 3 insertions(+), 18 deletions(-)
> 
> diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
> index 2ddfce8..a9ad288 100644
> --- a/kernel/debug/kdb/kdb_main.c
> +++ b/kernel/debug/kdb/kdb_main.c
> @@ -1493,6 +1493,7 @@ static void kdb_md_line(const char *fmtstr, unsigned long addr,
>  	char cbuf[32];
>  	char *c = cbuf;
>  	int i;
> +	int j;
>  	unsigned long word;
>  
>  	memset(cbuf, '\0', sizeof(cbuf));
> @@ -1538,25 +1539,9 @@ static void kdb_md_line(const char *fmtstr, unsigned long addr,
>  			wc.word = word;
>  #define printable_char(c) \
>  	({unsigned char __c = c; isascii(__c) && isprint(__c) ? __c : '.'; })
> -			switch (bytesperword) {
> -			case 8:
> +			for (j = 0; j < bytesperword; j++)
>  				*c++ = printable_char(*cp++);
> -				*c++ = printable_char(*cp++);
> -				*c++ = printable_char(*cp++);
> -				*c++ = printable_char(*cp++);
> -				addr += 4;
> -			case 4:
> -				*c++ = printable_char(*cp++);
> -				*c++ = printable_char(*cp++);
> -				addr += 2;
> -			case 2:
> -				*c++ = printable_char(*cp++);
> -				addr++;
> -			case 1:
> -				*c++ = printable_char(*cp++);
> -				addr++;
> -				break;
> -			}
> +			addr += bytesperword;
>  #undef printable_char
>  		}
>  	}
> -- 
> 2.7.4
>