strncmp(str, const, len) is error-prone. We had better use newly introduced str_has_prefix() instead of it.
Signed-off-by: Chuhong Yuan <[email protected]> --- kernel/printk/braille.c | 4 ++-- kernel/printk/printk.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c index 1d21ebacfdb8..64f0fb8ef27d 100644 --- a/kernel/printk/braille.c +++ b/kernel/printk/braille.c @@ -11,10 +11,10 @@ int _braille_console_setup(char **str, char **brl_options) { - if (!strncmp(*str, "brl,", 4)) { + if (str_has_prefix(*str, "brl,")) { *brl_options = ""; *str += 4; - } else if (!strncmp(*str, "brl=", 4)) { + } else if (str_has_prefix(*str, "brl=")) { *brl_options = *str + 4; *str = strchr(*brl_options, ','); if (!*str) { diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 1888f6a3b694..9e60dce4bdd5 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -121,13 +121,13 @@ static int __control_devkmsg(char *str) if (!str) return -EINVAL; - if (!strncmp(str, "on", 2)) { + if (str_has_prefix(str, "on")) { devkmsg_log = DEVKMSG_LOG_MASK_ON; return 2; - } else if (!strncmp(str, "off", 3)) { + } else if (str_has_prefix(str, "off")) { devkmsg_log = DEVKMSG_LOG_MASK_OFF; return 3; - } else if (!strncmp(str, "ratelimit", 9)) { + } else if (str_has_prefix(str, "ratelimit")) { devkmsg_log = DEVKMSG_LOG_MASK_DEFAULT; return 9; } -- 2.20.1
