From: David Disseldorp <ddiss@samba.org>
Date: Tue, 5 Dec 2017 12:21:04 +0000 (+0100)
Subject: vfs: drop casts for VFS_ADD_FSP_EXTENSION() callers
X-Git-Tag: talloc-2.1.11~287
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e1f792b2687f7e5514007405ef2987af35349cf;p=thirdparty%2Fsamba.git

vfs: drop casts for VFS_ADD_FSP_EXTENSION() callers

VFS_ADD_FSP_EXTENSION() now returns a properly typed pointer.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Dec  6 03:43:48 CET 2017 on sn-devel-144
---

diff --git a/source3/modules/vfs_cacheprime.c b/source3/modules/vfs_cacheprime.c
index 526a0574c5f..f06ece6a190 100644
--- a/source3/modules/vfs_cacheprime.c
+++ b/source3/modules/vfs_cacheprime.c
@@ -56,7 +56,7 @@ static bool prime_cache(
         off_t * last;
         ssize_t nread;
 
-        last = (off_t *)VFS_ADD_FSP_EXTENSION(handle, fsp, off_t, NULL);
+        last = VFS_ADD_FSP_EXTENSION(handle, fsp, off_t, NULL);
         if (!last) {
                 return False;
         }
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index 4088affc089..6f90c4d97bc 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -397,7 +397,7 @@ static int catia_fetch_fsp_pre_next(TALLOC_CTX *mem_ctx,
 	}
 
 	if (!make_tmp_cache) {
-		cc = (struct catia_cache *)VFS_ADD_FSP_EXTENSION(
+		cc = VFS_ADD_FSP_EXTENSION(
 			handle, fsp, struct catia_cache, NULL);
 		if (cc == NULL) {
 			return -1;
diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c
index 340276a7900..872b40bd78c 100644
--- a/source3/modules/vfs_commit.c
+++ b/source3/modules/vfs_commit.c
@@ -202,7 +202,7 @@ static int commit_open(
                                         MODULE, "eof mode", "none");
 
         if (dthresh > 0 || !strequal(eof_mode, "none")) {
-                c = (struct commit_info *)VFS_ADD_FSP_EXTENSION(
+                c = VFS_ADD_FSP_EXTENSION(
 			handle, fsp, struct commit_info, NULL);
                 /* Process main tunables */
                 if (c) {
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 05a5d396fba..6a478574c99 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3211,7 +3211,7 @@ static int fruit_open_meta(vfs_handle_struct *handle,
 		return -1;
 	}
 
-	fio = (struct fio *)VFS_ADD_FSP_EXTENSION(handle, fsp, struct fio, NULL);
+	fio = VFS_ADD_FSP_EXTENSION(handle, fsp, struct fio, NULL);
 	fio->type = ADOUBLE_META;
 	fio->config = config;
 
@@ -3378,7 +3378,7 @@ static int fruit_open_rsrc(vfs_handle_struct *handle,
 		return -1;
 	}
 
-	fio = (struct fio *)VFS_ADD_FSP_EXTENSION(handle, fsp, struct fio, NULL);
+	fio = VFS_ADD_FSP_EXTENSION(handle, fsp, struct fio, NULL);
 	fio->type = ADOUBLE_RSRC;
 	fio->config = config;
 
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 9489d9d4990..cffab7b986e 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -573,8 +573,7 @@ static int vfs_gluster_open(struct vfs_handle_struct *handle,
 	if (glfd == NULL) {
 		return -1;
 	}
-	p_tmp = (glfs_fd_t **)VFS_ADD_FSP_EXTENSION(handle, fsp,
-							  glfs_fd_t *, NULL);
+	p_tmp = VFS_ADD_FSP_EXTENSION(handle, fsp, glfs_fd_t *, NULL);
 	*p_tmp = glfd;
 	/* An arbitrary value for error reporting, so you know its us. */
 	return 13371337;
diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index f75f6a18dd6..c126a483f70 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -493,9 +493,7 @@ static int streams_xattr_open(vfs_handle_struct *handle,
 		}
 	}
 
-        sio = (struct stream_io *)VFS_ADD_FSP_EXTENSION(handle, fsp,
-							struct stream_io,
-							NULL);
+        sio = VFS_ADD_FSP_EXTENSION(handle, fsp, struct stream_io, NULL);
         if (sio == NULL) {
                 errno = ENOMEM;
                 goto fail;