openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-27 03:50:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warning messages when compiling under MinGW.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2004-05-09 10:07:28 +00:00
parent 97a2168f68
commit 68b5227871
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-05-09 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/file_io.c
Fix warning messages when compiling under MinGW.
2004-05-01 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* configure.ac

24
src/file_io.c
View File

@ -479,6 +479,7 @@ psf_fopen (SF_PRIVATE *psf, const char *pathname, int open_mode)
{ DWORD dwDesiredAccess ;
DWORD dwShareMode ;
DWORD dwCreationDistribution ;
HANDLE handle ;
switch (open_mode)
{ case SFM_READ :
@ -504,7 +505,7 @@ psf_fopen (SF_PRIVATE *psf, const char *pathname, int open_mode)
return psf->error ;
} ;
psf->filedes = (int) CreateFile (
handle = CreateFile (
pathname, /* pointer to name of the file */
dwDesiredAccess, /* access (read-write) mode */
dwShareMode, /* share mode */
@ -514,11 +515,12 @@ psf_fopen (SF_PRIVATE *psf, const char *pathname, int open_mode)
NULL /* handle to file with attributes to copy */
) ;
if (((HANDLE) psf->filedes) == INVALID_HANDLE_VALUE)
if (handle == INVALID_HANDLE_VALUE)
{ psf_log_syserr (psf, GetLastError ()) ;
return psf->error ;
} ;
psf->filedes = (int) handle ;
psf->mode = open_mode ;
return psf->error ;
@ -526,7 +528,8 @@ psf_fopen (SF_PRIVATE *psf, const char *pathname, int open_mode)
/* Win32 */ int
psf_set_stdio (SF_PRIVATE *psf, int mode)
{ int error = 0 ;
{ HANDLE handle = NULL ;
int error = 0 ;
switch (mode)
{ case SFM_RDWR :
@ -534,12 +537,12 @@ psf_set_stdio (SF_PRIVATE *psf, int mode)
break ;
case SFM_READ :
psf->filedes = (int) GetStdHandle (STD_INPUT_HANDLE) ;
handle = GetStdHandle (STD_INPUT_HANDLE) ;
psf->do_not_close_descriptor = 1 ;
break ;
case SFM_WRITE :
psf->filedes = (int) GetStdHandle (STD_OUTPUT_HANDLE) ;
handle = GetStdHandle (STD_OUTPUT_HANDLE) ;
psf->do_not_close_descriptor = 1 ;
break ;
@ -548,6 +551,7 @@ psf_set_stdio (SF_PRIVATE *psf, int mode)
break ;
} ;
psf->filedes = (int) handle ;
psf->filelength = 0 ;
return error ;
@ -555,10 +559,14 @@ psf_set_stdio (SF_PRIVATE *psf, int mode)
/* Win32 */ void
psf_set_file (SF_PRIVATE *psf, int fd)
{ HANDLE temp = _get_osfhandle (fd) ;
{ HANDLE handle ;
long osfhandle ;
if (GetFileType (temp) == FILE_TYPE_DISK)
psf->filedes = (int) temp ;
osfhandle = _get_osfhandle (fd) ;
handle = (HANDLE) osfhandle ;
if (GetFileType (handle) == FILE_TYPE_DISK)
psf->filedes = (int) handle ;
else
psf->filedes = fd ;
} /* psf_set_file */