From 067dcf3f157bbe20087d2b7a7a82d5758004c388 Mon Sep 17 00:00:00 2001 From: Rod Widdowson Date: Sun, 23 Jan 2011 10:59:28 +0000 Subject: [PATCH] Windows: read and write take void* buffers, open takes a const char* nt_read and nt_write were defined to take a char* buffer which was then cast to a void *. Meantime every call of OS_READ and OS_WRITE were casting to a char*. Equally every call of OS_OPEN was passing down a const char*, causing warnings. This checkin fixes this: nt_read : char* to void* nt_write: char* to const void* nt_open char* to const char* Reviewed-on: http://gerrit.openafs.org/3744 Tested-by: BuildBot Reviewed-by: Jeffrey Altman (cherry picked from commit 6d2636b886789f2ddc6374c6b7e58ccd28d518aa) Change-Id: Ib07ea6d1e0dad935717810c1279cc7f38645e229 Reviewed-on: http://gerrit.openafs.org/3863 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/vol/namei_ops.c | 4 ++-- src/vol/ntops.c | 10 +++++----- src/vol/ntops.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c index 9a79020e7..c8f9c8369 100644 --- a/src/vol/namei_ops.c +++ b/src/vol/namei_ops.c @@ -2739,7 +2739,7 @@ convertVolumeInfo(FD_t fdr, FD_t fdw, afs_uint32 vid) struct VolumeDiskData vd; char *p; - if (OS_READ(fdr, (char *)&vd, sizeof(struct VolumeDiskData)) != + if (OS_READ(fdr, &vd, sizeof(struct VolumeDiskData)) != sizeof(struct VolumeDiskData)) { Log("1 convertVolumeInfo: read failed for %lu with code %d\n", afs_printable_uint32_lu(vid), @@ -2758,7 +2758,7 @@ convertVolumeInfo(FD_t fdr, FD_t fdw, afs_uint32 vid) if (p && !strcmp(p, ".readonly")) { memset(p, 0, 9); } - if (OS_WRITE(fdw, (char *)&vd, sizeof(struct VolumeDiskData)) != + if (OS_WRITE(fdw, &vd, sizeof(struct VolumeDiskData)) != sizeof(struct VolumeDiskData)) { Log("1 convertVolumeInfo: write failed for %lu with code %d\n", afs_printable_uint32_lu(vid), diff --git a/src/vol/ntops.c b/src/vol/ntops.c index bbcfc9ae7..3e15ea408 100644 --- a/src/vol/ntops.c +++ b/src/vol/ntops.c @@ -75,7 +75,7 @@ nt_unlink(char *name) * the handle or -1 on error. */ FD_t -nt_open(char *name, int flags, int mode) +nt_open(const char *name, int flags, int mode) { HANDLE fh; DWORD nt_access = 0; @@ -140,12 +140,12 @@ nt_close(FD_t fd) } int -nt_write(FD_t fd, char *buf, afs_sfsize_t size) +nt_write(FD_t fd, void *buf, afs_sfsize_t size) { BOOL code; DWORD nbytes; - code = WriteFile((HANDLE) fd, (void *)buf, (DWORD) size, &nbytes, NULL); + code = WriteFile((HANDLE) fd, buf, (DWORD) size, &nbytes, NULL); if (!code) { errno = nterr_nt2unix(GetLastError(), EBADF); @@ -180,12 +180,12 @@ nt_pwrite(FD_t fd, const void * buf, afs_sfsize_t count, afs_foff_t offset) } int -nt_read(FD_t fd, char *buf, afs_sfsize_t size) +nt_read(FD_t fd, void *buf, afs_sfsize_t size) { BOOL code; DWORD nbytes; - code = ReadFile((HANDLE) fd, (void *)buf, (DWORD) size, &nbytes, NULL); + code = ReadFile((HANDLE) fd, buf, (DWORD) size, &nbytes, NULL); if (!code) { DWORD gle = GetLastError(); diff --git a/src/vol/ntops.h b/src/vol/ntops.h index e19dfd61d..666197910 100644 --- a/src/vol/ntops.h +++ b/src/vol/ntops.h @@ -22,10 +22,10 @@ extern char *PrintInode(char *, Inode); #endif /* Basic file operations */ -extern FD_t nt_open(char *name, int flags, int mode); +extern FD_t nt_open(const char *name, int flags, int mode); extern int nt_close(FD_t fd); -extern int nt_write(FD_t fd, char *buf, afs_sfsize_t size); -extern int nt_read(FD_t fd, char *buf, afs_sfsize_t size); +extern int nt_write(FD_t fd, void *buf, afs_sfsize_t size); +extern int nt_read(FD_t fd, void *buf, afs_sfsize_t size); extern int nt_pread(FD_t fd, void * buf, afs_sfsize_t count, afs_foff_t offset); extern int nt_pwrite(FD_t fd, const void * buf, afs_sfsize_t count, afs_foff_t offset); extern afs_sfsize_t nt_size(FD_t fd); -- 2.39.5