summaryrefslogtreecommitdiff
path: root/sal/osl
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-01-21 17:09:32 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-01-21 17:09:32 +0000
commit96c2f2bc8093c1dbf729d3d0c4849eefb87b5ce1 (patch)
treed4717936f45eb873784bb8a16a91a645de68de6b /sal/osl
parent59cefd339d0c3fcde5b614d7f142a957397672d9 (diff)
android: remove nonsensical write to file buffer during readLine
also expose in-memory file method for unit testing.
Diffstat (limited to 'sal/osl')
-rw-r--r--sal/osl/unx/file.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 84cb2f006811..7dd557a7cef5 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -699,8 +699,8 @@ oslFileError FileHandle_Impl::readLineAt (
}
if (state != LINE_STATE_BEGIN)
{
- /* store (and eat) the newline char */
- m_buffer[curpos] = 0x0A, curpos++;
+ /* skip the newline char */
+ curpos++;
/* flush buffer to sequence */
result = writeSequence_Impl (
@@ -854,9 +854,9 @@ static int osl_file_queryLocking (sal_uInt32 uFlags)
return 0;
}
-#ifdef ANDROID
+#ifdef UNX
-static oslFileError
+oslFileError
SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle *pHandle )
{
oslFileError eRet;