X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=nfs%2Fnfs.c;h=9d8086f7ca1e5611ad907128526f2eb2938b5c3f;hb=6a14f02fb2e18e66bbfd48ff3c5a7a5b677b51ed;hp=0c8ff79857f84670e2f9dc48891d4f03c7f88c8b;hpb=41d82d7d825b9b4e73bb227f5b2fafa86067cba0;p=deb_libnfs.git

diff --git a/nfs/nfs.c b/nfs/nfs.c
index 0c8ff79..9d8086f 100644
--- a/nfs/nfs.c
+++ b/nfs/nfs.c
@@ -15,22 +15,14 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(WIN32)
-#include <winsock2.h>
-#define S_IRUSR 0000400
-#define S_IWUSR 0000200
-#define S_IXUSR 0000100
-#define S_IRGRP 0000040
-#define S_IWGRP 0000020
-#define S_IXGRP 0000010
-#define S_IROTH 0000004
-#define S_IWOTH 0000002
-#define S_IXOTH 0000001
-#endif
+#ifdef WIN32
+#include "win32_compat.h"
+#else
+#include <sys/stat.h>
+#endif/*WIN32*/
 
 #include <stdio.h>
 #include <errno.h>
-#include <sys/stat.h>
 #include <string.h>
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
@@ -39,8 +31,6 @@
 #include "libnfs-private.h"
 #include "libnfs-raw-nfs.h"
 
-
-
 char *nfsstat3_to_str(int error)
 {
 	switch (error) {
@@ -363,7 +353,7 @@ int rpc_nfs_mkdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 		return -1;
 	}
 
-	bzero(&args, sizeof(MKDIR3args));
+	memset(&args, 0, sizeof(MKDIR3args));
 	args.where.dir.data.data_len = fh->data.data_len;
 	args.where.dir.data.data_val = fh->data.data_val;
 	args.where.name = dir;
@@ -399,7 +389,7 @@ int rpc_nfs_rmdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 		return -1;
 	}
 
-	bzero(&args, sizeof(RMDIR3args));
+	memset(&args, 0, sizeof(RMDIR3args));
 	args.object.dir.data.data_len = fh->data.data_len;
 	args.object.dir.data.data_val = fh->data.data_val;
 	args.object.name = dir;
@@ -432,7 +422,7 @@ int rpc_nfs_create_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 		return -1;
 	}
 
-	bzero(&args, sizeof(CREATE3args));
+	memset(&args, 0, sizeof(CREATE3args));
 	args.where.dir.data.data_len = fh->data.data_len;
 	args.where.dir.data.data_val = fh->data.data_val;
 	args.where.name = file;
@@ -469,7 +459,7 @@ int rpc_nfs_remove_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 		return -1;
 	}
 
-	bzero(&args, sizeof(REMOVE3args));
+	memset(&args, 0, sizeof(REMOVE3args));
 	args.object.dir.data.data_len = fh->data.data_len;
 	args.object.dir.data.data_val = fh->data.data_val;
 	args.object.name = file;
@@ -500,7 +490,7 @@ int rpc_nfs_readdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh
 		return -1;
 	}
 
-	bzero(&args, sizeof(READDIR3args));
+	memset(&args, 0, sizeof(READDIR3args));
 	args.dir.data.data_len = fh->data.data_len;
 	args.dir.data.data_val = fh->data.data_val;
 	args.cookie = cookie;
@@ -533,7 +523,7 @@ int rpc_nfs_readdirplus_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3
 		return -1;
 	}
 
-	bzero(&args, sizeof(READDIRPLUS3args));
+	memset(&args, 0, sizeof(READDIRPLUS3args));
 	args.dir.data.data_len = fh->data.data_len;
 	args.dir.data.data_val = fh->data.data_val;
 	args.cookie = cookie;
@@ -655,7 +645,7 @@ int rpc_nfs_symlink_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh
 		return -1;
 	}
 
-	bzero(&args, sizeof(SYMLINK3args));
+	memset(&args, 0, sizeof(SYMLINK3args));
 	args.where.dir.data.data_len = fh->data.data_len;
 	args.where.dir.data.data_val = fh->data.data_val;
 	args.where.name = newname;
@@ -692,7 +682,7 @@ int rpc_nfs_rename_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *old
 		return -1;
 	}
 
-	bzero(&args, sizeof(RENAME3args));
+	memset(&args, 0, sizeof(RENAME3args));
 	args.from.dir.data.data_len = olddir->data.data_len;
 	args.from.dir.data.data_val = olddir->data.data_val;
 	args.from.name = oldname;
@@ -729,7 +719,7 @@ int rpc_nfs_link_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *file,
 		return -1;
 	}
 
-	bzero(&args, sizeof(LINK3args));
+	memset(&args, 0, sizeof(LINK3args));
 	args.file.data.data_len = file->data.data_len;
 	args.file.data.data_val = file->data.data_val;
 	args.link.dir.data.data_len = newdir->data.data_len;