[v4,3/8] PM/sleep: Replace strncmp with str_has_prefix
diff mbox series

Message ID 20190809071023.17224-1-hslester96@gmail.com
State Mainlined, archived
Headers show
Series
  • Replace strncmp with str_has_prefix
Related show

Commit Message

Chuhong Yuan Aug. 9, 2019, 7:10 a.m. UTC
strncmp(str, const, len) is error-prone because len
is easy to have typo.
The example is the hard-coded len has counting error
or sizeof(const) forgets - 1.
So we prefer using newly introduced str_has_prefix()
to substitute such strncmp to make code better.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
 kernel/power/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rafael J. Wysocki Aug. 26, 2019, 9:19 a.m. UTC | #1
On Friday, August 9, 2019 9:10:23 AM CEST Chuhong Yuan wrote:
> strncmp(str, const, len) is error-prone because len
> is easy to have typo.
> The example is the hard-coded len has counting error
> or sizeof(const) forgets - 1.
> So we prefer using newly introduced str_has_prefix()
> to substitute such strncmp to make code better.
> 
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> ---
>  kernel/power/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/power/main.c b/kernel/power/main.c
> index bdbd605c4215..5e5f64bb3a43 100644
> --- a/kernel/power/main.c
> +++ b/kernel/power/main.c
> @@ -495,7 +495,7 @@ static suspend_state_t decode_state(const char *buf, size_t n)
>  	len = p ? p - buf : n;
>  
>  	/* Check hibernation first. */
> -	if (len == 4 && !strncmp(buf, "disk", len))
> +	if (len == 4 && str_has_prefix(buf, "disk"))
>  		return PM_SUSPEND_MAX;
>  
>  #ifdef CONFIG_SUSPEND
> 

Applied, thanks!

Patch
diff mbox series

diff --git a/kernel/power/main.c b/kernel/power/main.c
index bdbd605c4215..5e5f64bb3a43 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -495,7 +495,7 @@  static suspend_state_t decode_state(const char *buf, size_t n)
 	len = p ? p - buf : n;
 
 	/* Check hibernation first. */
-	if (len == 4 && !strncmp(buf, "disk", len))
+	if (len == 4 && str_has_prefix(buf, "disk"))
 		return PM_SUSPEND_MAX;
 
 #ifdef CONFIG_SUSPEND