From 3c940d394ffc59d8f2d327225d899b7e9fe182e9 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Mon, 25 Mar 2013 03:36:44 +0100
Subject: [PATCH] apr_file_read has apr_size_t* as last paramter, not U32*.

---
 indra/llcommon/nd/ndfile.cpp | 8 ++++++--
 indra/llcommon/nd/ndfile.h   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/indra/llcommon/nd/ndfile.cpp b/indra/llcommon/nd/ndfile.cpp
index e7ec0acd39..5a29a3628b 100644
--- a/indra/llcommon/nd/ndfile.cpp
+++ b/indra/llcommon/nd/ndfile.cpp
@@ -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;
 }
diff --git a/indra/llcommon/nd/ndfile.h b/indra/llcommon/nd/ndfile.h
index 14f70ac1b8..ee39bb2537 100644
--- a/indra/llcommon/nd/ndfile.h
+++ b/indra/llcommon/nd/ndfile.h
@@ -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
 {