livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apr_file_read has apr_size_t* as last paramter, not U32*.

Nicky 2013-03-25 03:36:44 +01:00
parent 44920cd8c5
commit 3c940d394f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llcommon/nd/ndfile.cpp
View File

@ -462,12 +462,16 @@ int apr_file_lock( FILE *aFile, int aLock )
#endif
}
int apr_file_read( FILE *aFile, void *aBuffer, U32 *aLen )
int apr_file_read( FILE *aFile, void *aBuffer, apr_size_t *aLen )
{
if( aLen )
*aLen = 0;
U32 nRead = fread( aBuffer, 1, *aLen, aFile );
if( 0 == nRead )
return APR_OS_START_SYSERR + ferror( aFile );
*aLen = nRead;
if( aLen )
*aLen = nRead;
return APR_SUCCESS;
}

2
indra/llcommon/nd/ndfile.h
View File

@ -103,7 +103,7 @@ int LL_COMMON_API apr_file_printf( FILE*, char const*, ... );
int LL_COMMON_API apr_file_eof( FILE* );
int LL_COMMON_API apr_file_gets( char*, U32, FILE* );
int LL_COMMON_API apr_file_lock( FILE*, int );
int LL_COMMON_API apr_file_read( FILE*, void*, U32* );
int LL_COMMON_API apr_file_read( FILE*, void*, apr_size_t* );
namespace nd
{