Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [nfs-utils PATCH 1/1] Switch legacy index() in favour of strchr()
To:     Petr Vorel <petr.vorel@gmail.com>, linux-nfs@vger.kernel.org
Cc:     Frederik Pasch <fpasch@googlemail.com>,
        Gustavo Zacarias <gustavo@zacarias.com.ar>
References: <20191122163155.6971-1-petr.vorel@gmail.com>
From:   Steve Dickson <SteveD@RedHat.com>
Message-ID: <4813e3b8-ee75-d4e2-774e-84734b6b6718@RedHat.com>
Date:   Fri, 22 Nov 2019 13:27:34 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.1.1
MIME-Version: 1.0
In-Reply-To: <20191122163155.6971-1-petr.vorel@gmail.com>
Content-Language: en-US
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk


On 11/22/19 11:31 AM, Petr Vorel wrote:
> From: Frederik Pasch <fpasch@googlemail.com>
> 
> [ gustavo: rebased to 1.2.6 ]
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> [ pvorel: taken from Buildroot distribution, rebased ]
> Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> Signed-off-by: Frederik Pasch <fpasch@googlemail.com>
> ---
>  support/nfs/nfs_mntent.c | 6 +++---
>  utils/mount/error.c      | 2 +-
>  utils/mountd/fsloc.c     | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
Committed... (tag: nfs-utils-2-4-3-rc2)

steved.
> 
> diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c
> index 05a4c687..25e5944a 100644
> --- a/support/nfs/nfs_mntent.c
> +++ b/support/nfs/nfs_mntent.c
> @@ -9,7 +9,7 @@
>   */
>  
>  #include <stdio.h>
> -#include <string.h>		/* for index */
> +#include <string.h>		/* for strchr */
>  #include <ctype.h>		/* for isdigit */
>  #include <sys/stat.h>		/* for umask */
>  #include <unistd.h>		/* for ftruncate */
> @@ -176,7 +176,7 @@ nfs_getmntent (mntFILE *mfp) {
>  			return NULL;
>  
>  		mfp->mntent_lineno++;
> -		s = index (buf, '\n');
> +		s = strchr (buf, '\n');
>  		if (s == NULL) {
>  			/* Missing final newline?  Otherwise extremely */
>  			/* long line - assume file was corrupted */
> @@ -184,7 +184,7 @@ nfs_getmntent (mntFILE *mfp) {
>  				fprintf(stderr, _("[mntent]: warning: no final "
>  					"newline at the end of %s\n"),
>  					mfp->mntent_file);
> -				s = index (buf, 0);
> +				s = strchr (buf, 0);
>  			} else {
>  				mfp->mntent_errs = 1;
>  				goto err;
> diff --git a/utils/mount/error.c b/utils/mount/error.c
> index 562f312e..986f0660 100644
> --- a/utils/mount/error.c
> +++ b/utils/mount/error.c
> @@ -62,7 +62,7 @@ static int rpc_strerror(int spos)
>  	char *tmp;
>  
>  	if (estr) {
> -		if ((ptr = index(estr, ':')))
> +		if ((ptr = strchr(estr, ':')))
>  			estr = ++ptr;
>  
>  		tmp = &errbuf[spos];
> diff --git a/utils/mountd/fsloc.c b/utils/mountd/fsloc.c
> index cf42944f..1b869b60 100644
> --- a/utils/mountd/fsloc.c
> +++ b/utils/mountd/fsloc.c
> @@ -128,7 +128,7 @@ static struct servers *method_list(char *data)
>  	bool v6esc = false;
>  
>  	xlog(L_NOTICE, "method_list(%s)", data);
> -	for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
> +	for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
>  		ptr++;
>  	list = malloc(listsize * sizeof(char *));
>  	copy = strdup(data);
>