Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:42:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix warnings in io.c.

Browse source 
svn path=/trunk/; revision=35066
This commit is contained in:
Aleksey Bragin 2008-08-03 12:46:43 +00:00
parent 059407e16e
commit 56184fa149
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rosapps/applications/sysutils/dosfsck/io.c
View file

@ -68,7 +68,7 @@ static loff_t WIN32llseek(int fd, loff_t offset, int whence);
#endif #endif
#define llseek WIN32llseek #define llseek WIN32llseek
static int is_device = 0; //static int is_device = 0;
void fs_open(char *path,int rw) void fs_open(char *path,int rw)
{ {
@ -139,8 +139,6 @@ int fs_test(loff_t pos,int size)
#if 1 // TMN #if 1 // TMN
const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; // TMN: const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; // TMN:
const loff_t seekpos_aligned = pos - (pos % 512); // TMN: const loff_t seekpos_aligned = pos - (pos % 512); // TMN:
const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN:
const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN:
scratch = alloc(readsize_aligned); scratch = alloc(readsize_aligned);
if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos);
okay = read(fd,scratch,readsize_aligned) == (int)readsize_aligned; okay = read(fd,scratch,readsize_aligned) == (int)readsize_aligned;
@ -166,7 +164,6 @@ void fs_write(loff_t pos,int size,void *data)
const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size;
const loff_t seekpos_aligned = pos - (pos % 512); const loff_t seekpos_aligned = pos - (pos % 512);
const size_t seek_delta = (size_t)(pos - seekpos_aligned); const size_t seek_delta = (size_t)(pos - seekpos_aligned);
const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned;
boolean use_read = (seek_delta != 0) || ((readsize_aligned-size) != 0); boolean use_read = (seek_delta != 0) || ((readsize_aligned-size) != 0);
/* Aloc temp buffer if write is not aligned */ /* Aloc temp buffer if write is not aligned */
@ -184,7 +181,7 @@ void fs_write(loff_t pos,int size,void *data)
if (read(fd,scratch,readsize_aligned) < 0) pdie("Read %d bytes at %I64d",size,pos); if (read(fd,scratch,readsize_aligned) < 0) pdie("Read %d bytes at %I64d",size,pos);
/* Patch data in memory */ /* Patch data in memory */
memcpy(data, scratch+seek_delta, size); memcpy(data, (char *)scratch+seek_delta, size);
} }
/* Write it back */ /* Write it back */
@ -229,7 +226,7 @@ void fs_write(loff_t pos,int size,void *data)
static void fs_flush(void) static void fs_flush(void)
{ {
CHANGE *this; CHANGE *this;
int size; //int size;
int old_write_immed = write_immed; int old_write_immed = write_immed;
/* Disable writes to the list now */ /* Disable writes to the list now */
@ -300,9 +297,9 @@ int fs_changed(void)
static int WIN32open(const char *path, int oflag, ...) static int WIN32open(const char *path, int oflag, ...)
{ {
HANDLE fh; HANDLE fh;
DWORD desiredAccess; DWORD desiredAccess = 0;
DWORD shareMode; DWORD shareMode = 0;
DWORD creationDisposition; DWORD creationDisposition = 0;
DWORD flagsAttributes = FILE_ATTRIBUTE_NORMAL; DWORD flagsAttributes = FILE_ATTRIBUTE_NORMAL;
SECURITY_ATTRIBUTES securityAttributes; SECURITY_ATTRIBUTES securityAttributes;
va_list ap; va_list ap;