Skip to content

Commit

Permalink
Changed vars named "FileHandle" to "Handle" to not cause confusion with
Browse files Browse the repository at this point in the history 
new type in physfs.c ...
  • Loading branch information
@icculus
icculus committed Sep 26, 2004
1 parent 90031c8 commit 27f82cc
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
28 changes: 14 additions & 14 deletions platform/pocketpc.c
View file
Expand Up @@ -471,15 +471,15 @@ void *__PHYSFS_platformOpenAppend(const char *filename)
PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer,
PHYSFS_uint32 size, PHYSFS_uint32 count)
{
HANDLE FileHandle = ((winCEfile *) opaque)->handle;
HANDLE Handle = ((winCEfile *) opaque)->handle;
DWORD CountOfBytesRead;
PHYSFS_sint64 retval;

/* Read data from the file */
/*!!! - uint32 might be a greater # than DWORD */
if(!ReadFile(FileHandle, buffer, count * size, &CountOfBytesRead, NULL))
if (!ReadFile(Handle, buffer, count * size, &CountOfBytesRead, NULL))
{
retval=-1;
retval = -1;
} /* if */
else
{
Expand All @@ -496,15 +496,15 @@ PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer,
PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer,
PHYSFS_uint32 size, PHYSFS_uint32 count)
{
HANDLE FileHandle = ((winCEfile *) opaque)->handle;
HANDLE Handle = ((winCEfile *) opaque)->handle;
DWORD CountOfBytesWritten;
PHYSFS_sint64 retval;

/* Read data from the file */
/*!!! - uint32 might be a greater # than DWORD */
if(!WriteFile(FileHandle, buffer, count * size, &CountOfBytesWritten, NULL))
if (!WriteFile(Handle, buffer, count * size, &CountOfBytesWritten, NULL))
{
retval=-1;
retval = -1;
} /* if */
else
{
Expand All @@ -520,7 +520,7 @@ PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer,

int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos)
{
HANDLE FileHandle = ((winCEfile *) opaque)->handle;
HANDLE Handle = ((winCEfile *) opaque)->handle;
DWORD HighOrderPos;
DWORD rc;

Expand All @@ -530,7 +530,7 @@ int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos)

/*!!! SetFilePointer needs a signed 64-bit value. */
/* Move pointer "pos" count from start of file */
rc = SetFilePointer(FileHandle, (unsigned long)(pos&0x00000000ffffffff),
rc = SetFilePointer(Handle, (unsigned long)(pos&0x00000000ffffffff),
&HighOrderPos, FILE_BEGIN);

if ((rc == INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR))
Expand All @@ -544,13 +544,13 @@ int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos)

PHYSFS_sint64 __PHYSFS_platformTell(void *opaque)
{
HANDLE FileHandle = ((winCEfile *) opaque)->handle;
HANDLE Handle = ((winCEfile *) opaque)->handle;
DWORD HighPos = 0;
DWORD LowPos;
PHYSFS_sint64 retval;

/* Get current position */
LowPos = SetFilePointer(FileHandle, 0, &HighPos, FILE_CURRENT);
LowPos = SetFilePointer(Handle, 0, &HighPos, FILE_CURRENT);
if ((LowPos == INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR))
{
BAIL_MACRO(win32strerror(), 0);
Expand All @@ -568,12 +568,12 @@ PHYSFS_sint64 __PHYSFS_platformTell(void *opaque)

PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque)
{
HANDLE FileHandle = ((winCEfile *) opaque)->handle;
HANDLE Handle = ((winCEfile *) opaque)->handle;
DWORD SizeHigh;
DWORD SizeLow;
PHYSFS_sint64 retval;

SizeLow = GetFileSize(FileHandle, &SizeHigh);
SizeLow = GetFileSize(Handle, &SizeHigh);
if ((SizeLow == INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR))
{
BAIL_MACRO(win32strerror(), -1);
Expand Down Expand Up @@ -617,8 +617,8 @@ int __PHYSFS_platformFlush(void *opaque)

int __PHYSFS_platformClose(void *opaque)
{
HANDLE FileHandle = ((winCEfile *) opaque)->handle;
BAIL_IF_MACRO(!CloseHandle(FileHandle), win32strerror(), 0);
HANDLE Handle = ((winCEfile *) opaque)->handle;
BAIL_IF_MACRO(!CloseHandle(Handle), win32strerror(), 0);
free(opaque);
return(1);
} /* __PHYSFS_platformClose */
Expand Down
24 changes: 12 additions & 12 deletions platform/win32.c
View file
Expand Up @@ -802,13 +802,13 @@ void *__PHYSFS_platformOpenAppend(const char *filename)
PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer,
PHYSFS_uint32 size, PHYSFS_uint32 count)
{
HANDLE FileHandle = ((win32file *) opaque)->handle;
HANDLE Handle = ((win32file *) opaque)->handle;
DWORD CountOfBytesRead;
PHYSFS_sint64 retval;

/* Read data from the file */
/* !!! FIXME: uint32 might be a greater # than DWORD */
if(!ReadFile(FileHandle, buffer, count * size, &CountOfBytesRead, NULL))
if(!ReadFile(Handle, buffer, count * size, &CountOfBytesRead, NULL))
{
BAIL_MACRO(win32strerror(), -1);
} /* if */
Expand All @@ -826,13 +826,13 @@ PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer,
PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer,
PHYSFS_uint32 size, PHYSFS_uint32 count)
{
HANDLE FileHandle = ((win32file *) opaque)->handle;
HANDLE Handle = ((win32file *) opaque)->handle;
DWORD CountOfBytesWritten;
PHYSFS_sint64 retval;

/* Read data from the file */
/* !!! FIXME: uint32 might be a greater # than DWORD */
if(!WriteFile(FileHandle, buffer, count * size, &CountOfBytesWritten, NULL))
if(!WriteFile(Handle, buffer, count * size, &CountOfBytesWritten, NULL))
{
BAIL_MACRO(win32strerror(), -1);
} /* if */
Expand All @@ -849,7 +849,7 @@ PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer,

int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos)
{
HANDLE FileHandle = ((win32file *) opaque)->handle;
HANDLE Handle = ((win32file *) opaque)->handle;
DWORD HighOrderPos;
DWORD *pHighOrderPos;
DWORD rc;
Expand All @@ -872,7 +872,7 @@ int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos)
*/

/* Move pointer "pos" count from start of file */
rc = SetFilePointer(FileHandle, LOWORDER_UINT64(pos),
rc = SetFilePointer(Handle, LOWORDER_UINT64(pos),
pHighOrderPos, FILE_BEGIN);

if ( (rc == PHYSFS_INVALID_SET_FILE_POINTER) &&
Expand All @@ -887,13 +887,13 @@ int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos)

PHYSFS_sint64 __PHYSFS_platformTell(void *opaque)
{
HANDLE FileHandle = ((win32file *) opaque)->handle;
HANDLE Handle = ((win32file *) opaque)->handle;
DWORD HighPos = 0;
DWORD LowPos;
PHYSFS_sint64 retval;

/* Get current position */
LowPos = SetFilePointer(FileHandle, 0, &HighPos, FILE_CURRENT);
LowPos = SetFilePointer(Handle, 0, &HighPos, FILE_CURRENT);
if ( (LowPos == PHYSFS_INVALID_SET_FILE_POINTER) &&
(GetLastError() != NO_ERROR) )
{
Expand All @@ -912,12 +912,12 @@ PHYSFS_sint64 __PHYSFS_platformTell(void *opaque)

PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque)
{
HANDLE FileHandle = ((win32file *) opaque)->handle;
HANDLE Handle = ((win32file *) opaque)->handle;
DWORD SizeHigh;
DWORD SizeLow;
PHYSFS_sint64 retval;

SizeLow = GetFileSize(FileHandle, &SizeHigh);
SizeLow = GetFileSize(Handle, &SizeHigh);
if ( (SizeLow == PHYSFS_INVALID_SET_FILE_POINTER) &&
(GetLastError() != NO_ERROR) )
{
Expand Down Expand Up @@ -962,8 +962,8 @@ int __PHYSFS_platformFlush(void *opaque)

int __PHYSFS_platformClose(void *opaque)
{
HANDLE FileHandle = ((win32file *) opaque)->handle;
BAIL_IF_MACRO(!CloseHandle(FileHandle), win32strerror(), 0);
HANDLE Handle = ((win32file *) opaque)->handle;
BAIL_IF_MACRO(!CloseHandle(Handle), win32strerror(), 0);
free(opaque);
return(1);
} /* __PHYSFS_platformClose */
Expand Down

0 comments on commit 27f82cc

Please sign in to comment.