memset() is posix, bzero() is not change bzero into memset

[deb_libnfs.git] / nfs / nfs.c

diff --git a/nfs/nfs.c b/nfs/nfs.c
index 1daaa5681f657d0e6643e8b77b0f97f577562bbf..8e8baf4370ee8c10401e1ccc00cb2780f9d95645 100644 (file)
--- a/nfs/nfs.c
+++ b/nfs/nfs.c
@@ -15,6 +15,19 @@
    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
+
 #include <stdio.h>
 #include <errno.h>
 #include <sys/stat.h>
@@ -350,7 +363,7 @@ int rpc_nfs_mkdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
                return -1;
        }
 
-       bzero((char *)&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;
@@ -386,7 +399,7 @@ int rpc_nfs_rmdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
                return -1;
        }
 
-       bzero((char *)&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;
@@ -419,7 +432,7 @@ int rpc_nfs_create_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
                return -1;
        }
 
-       bzero((char *)&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;
@@ -456,7 +469,7 @@ int rpc_nfs_remove_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
                return -1;
        }
 
-       bzero((char *)&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;
@@ -487,7 +500,7 @@ int rpc_nfs_readdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh
                return -1;
        }
 
-       bzero((char *)&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;
@@ -520,7 +533,7 @@ int rpc_nfs_readdirplus_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3
                return -1;
        }
 
-       bzero((char *)&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;
@@ -642,7 +655,7 @@ int rpc_nfs_symlink_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh
                return -1;
        }
 
-       bzero((char *)&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;
@@ -679,7 +692,7 @@ int rpc_nfs_rename_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *old
                return -1;
        }
 
-       bzero((char *)&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;
@@ -716,7 +729,7 @@ int rpc_nfs_link_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *file,
                return -1;
        }
 
-       bzero((char *)&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;