Skip to contentSkip to conversation

PM/sleep: Replace strncmp with str_has_prefix

PATCH Applied Chuhong Yuan 2 participants 2 messages Aug 9, 2019 – Aug 26, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 3/8 PM/sleep: Replace strncmp with str_has_prefix

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.

---
 kernel/power/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/main.c +1 -1
index bdbd605c4215..5e5f64bb3a43 100644
@@ -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
Signature · 1 line
2.20.1
#1 lore raw
Quoted 18 lines · CEST Chuhong Yuan

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.

---
 kernel/power/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/main.c +0 -0
index bdbd605c4215..5e5f64bb3a43 100644

kernel/power/main.c static suspend_state_t decode_state(const char *buf, size_t n) · line 501

Quoted 8 lines
kernel/power/main.c +1 -1
@@ -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!