michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: changed dead code part in function buffer_trim()

Browse source 
According to the Coverity issue 190614 (github issue #12319)
Fix for logically dead code in function buffer_trim
Before while execution cannot reach this statement: buff[0] = '\0';

Tested and noticed that part of code is unnecessary inside of while
For the test, I made the same function in CodeBlocks and send to it
string to detect and delete whitespaces. After deletion of dead code
part, I tested function again, it works.

Function buffer_trim first detects whitespace characters in the end
of the string using first while, then it adds '\0' to the end
of the string to mark that string has new end after all whitespace
characters. Second while finds whitespaces at the beginning
of the string and counts how many whitespaces it found.
In the end using if counted whitespaces are removing from the
string.

Signed-off-by: Maksim Masalski <maxxliferobot@gmail.com>
This commit is contained in:
Maksim Masalski 2019-02-24 22:12:27 +03:00 • committed by Anas Nashif
commit a4c0810aa0
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
subsys/shell/shell_utils.c
View file

@ -359,12 +359,8 @@ static void buffer_trim(char *buff, u16_t *buff_len)
/* Counting whitespace characters starting from beginning of the
* command.
*/
while (isspace((int) buff[i++])) {
if (i == 0) {
buff[0] = '\0';
return;
}
}
while (isspace((int) buff[i++]))
;
/* Removing counted whitespace characters. */
if (--i > 0) {
@ -378,4 +374,3 @@ void shell_cmd_trim(const struct shell *shell)
buffer_trim(shell->ctx->cmd_buff, &shell->ctx->cmd_buff_len);
shell->ctx->cmd_buff_pos = shell->ctx->cmd_buff_len;
}