Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <5dee05d6cb8498b3e636f5e8a62da673334cb5a9.camel@perches.com>
Subject: Re: [PATCH 08/12] printk: Replace strncmp with str_has_prefix
From:   Joe Perches <joe@perches.com>
To:     Chuhong Yuan <hslester96@gmail.com>
Cc:     Petr Mladek <pmladek@suse.com>,
        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        linux-kernel@vger.kernel.org
Date:   Mon, 29 Jul 2019 17:16:35 -0700
In-Reply-To: <20190729151505.9660-1-hslester96@gmail.com>
References: <20190729151505.9660-1-hslester96@gmail.com>
Content-Type: text/plain; charset="ISO-8859-1"
User-Agent: Evolution 3.30.5-0ubuntu0.18.10.1 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, 2019-07-29 at 23:15 +0800, Chuhong Yuan wrote:
> strncmp(str, const, len) is error-prone.
> We had better use newly introduced
> str_has_prefix() instead of it.
[]
> diff --git 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;

Better to get rid of the += 4 uses too by storing the result
of str_has_prefix and using that as the addend.

Perhaps
	size_t len;

	if ((len = str_has_prefix(*str, "brl,"))) {
		*brl_options = "";
		*str += len;
	} else if ((len = str_has_prefix(*str, "brl="))) {
		etc...

>  		*str = strchr(*brl_options, ',');
>  		if (!*str) {
> diff --git 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;
>  	}

here too.