From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sun, 28 Aug 2011 09:27:23 +0000 (+1000)
Subject: replace index/rindex with modern equivalents
X-Git-Tag: upstream/1.9.6^2~326^2~11
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=a671a46510c03fcf06e7a4c5812aa4a20fdc850d;p=deb_libnfs.git

replace index/rindex with modern equivalents
---

diff --git a/lib/libnfs.c b/lib/libnfs.c
index 5270923..80a7394 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -557,7 +557,7 @@ static int nfs_lookup_path_async_internal(struct nfs_context *nfs, struct nfs_cb
 	}
 
 	path = data->path;
-	str = index(path, '/');
+	str = strchr(path, '/');
 	if (str != NULL) {
 		*str = 0;
 		data->path = str+1;
@@ -1333,7 +1333,7 @@ int nfs_mkdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *
 		return -1;
 	}
 
-	ptr = rindex(new_path, '/');
+	ptr = strrchr(new_path, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", path);
 		return -1;
@@ -1414,7 +1414,7 @@ int nfs_rmdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *
 		return -1;
 	}
 
-	ptr = rindex(new_path, '/');
+	ptr = strrchr(new_path, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", path);
 		return -1;
@@ -1546,7 +1546,7 @@ int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
 		return -1;
 	}
 
-	ptr = rindex(new_path, '/');
+	ptr = strrchr(new_path, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", path);
 		return -1;
@@ -1626,7 +1626,7 @@ int nfs_unlink_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void
 		return -1;
 	}
 
-	ptr = rindex(new_path, '/');
+	ptr = strrchr(new_path, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", path);
 		return -1;
@@ -2528,7 +2528,7 @@ int nfs_symlink_async(struct nfs_context *nfs, const char *oldpath, const char *
 		return -1;
 	}
 
-	ptr = rindex(symlink_data->newpathparent, '/');
+	ptr = strrchr(symlink_data->newpathparent, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", oldpath);
 		free_nfs_symlink_data(symlink_data);
@@ -2674,7 +2674,7 @@ int nfs_rename_async(struct nfs_context *nfs, const char *oldpath, const char *n
 		free_nfs_rename_data(rename_data);
 		return -1;
 	}
-	ptr = rindex(rename_data->oldpath, '/');
+	ptr = strrchr(rename_data->oldpath, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", oldpath);
 		free_nfs_rename_data(rename_data);
@@ -2691,7 +2691,7 @@ int nfs_rename_async(struct nfs_context *nfs, const char *oldpath, const char *n
 		free_nfs_rename_data(rename_data);
 		return -1;
 	}
-	ptr = rindex(rename_data->newpath, '/');
+	ptr = strrchr(rename_data->newpath, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", newpath);
 		free_nfs_rename_data(rename_data);
@@ -2837,7 +2837,7 @@ int nfs_link_async(struct nfs_context *nfs, const char *oldpath, const char *new
 		free_nfs_link_data(link_data);
 		return -1;
 	}
-	ptr = rindex(link_data->newpath, '/');
+	ptr = strrchr(link_data->newpath, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", newpath);
 		free_nfs_link_data(link_data);