summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-02-05 11:10:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2021-02-05 15:01:48 +0100
commit0ce7c84cc7b3f53a56a70586f73d7615f68ec1dc (patch)
tree410bb933b09711440bed16f006f2556140d5ce7f /sal
parentcb4ba42fbf421a17a8ba0e32ef09add928f2b694 (diff)
Revert "Fix typo in code"
This reverts commit 3ed9bba283a6a67864c0928186e277240be0d9ba. osl_Pos_Absolut (include/osl/file.h) is part of the stable URE interface; it must not be changed. Change-Id: I1f49923a9351e4be5aee39b10720d38b424feb9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110435 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/file.cxx2
-rw-r--r--sal/osl/w32/file.cxx2
-rw-r--r--sal/qa/osl/file/osl_File.cxx18
3 files changed, 11 insertions, 11 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index f4d6b229c3f7..d8396f6279b6 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1549,7 +1549,7 @@ oslFileError SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_
FileHandle_Impl::Guard lock(&(pImpl->m_mutex));
switch (uHow)
{
- case osl_Pos_Absolute:
+ case osl_Pos_Absolut:
if (nOffset < 0)
return osl_File_E_INVAL;
break;
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 1803121f503d..ca31d714dfef 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -976,7 +976,7 @@ oslFileError SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_
FileHandle_Impl::Guard lock(&(pImpl->m_mutex));
switch (uHow)
{
- case osl_Pos_Absolute:
+ case osl_Pos_Absolut:
if (nOffset < 0)
return osl_File_E_INVAL;
break;
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index a9f7183f673e..30ef0e322eeb 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -2254,7 +2254,7 @@ namespace osl_File
auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
auto nError2 = testFile.write(buffer_write, 30, nCount_write);
- osl::FileBase::RC nError4 = testFile.setPos(osl_Pos_Absolute, 0);
+ osl::FileBase::RC nError4 = testFile.setPos(osl_Pos_Absolut, 0);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError4);
auto nError3 = testFile.read(buffer_read, 10, nCount_read);
@@ -2328,7 +2328,7 @@ namespace osl_File
auto nError2 = testFile.close();
- auto nError3 = testFile.setPos(osl_Pos_Absolute, 0);
+ auto nError3 = testFile.setPos(osl_Pos_Absolut, 0);
CPPUNIT_ASSERT_EQUAL_MESSAGE("test for close function: manipulate a file after it has been closed",
osl::FileBase::E_None, nError2);
@@ -2380,7 +2380,7 @@ namespace osl_File
auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
- nError1 = testFile.setPos(osl_Pos_Absolute, 26);
+ nError1 = testFile.setPos(osl_Pos_Absolut, 26);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
sal_uInt64 nCount_read = 0;
nError1 = testFile.read(buffer_read, 1, nCount_read);
@@ -2388,7 +2388,7 @@ namespace osl_File
nError1 = testFile.close();
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_Absolute, set the position to 26, test if the 26th char in file is correct",
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_Absolut, set the position to 26, test if the 26th char in file is correct",
pBuffer_Char[26], buffer_read[0]);
}
@@ -2399,7 +2399,7 @@ namespace osl_File
auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
- nError1 = testFile.setPos(osl_Pos_Absolute, sizeof(pBuffer_Char) - 2);
+ nError1 = testFile.setPos(osl_Pos_Absolut, sizeof(pBuffer_Char) - 2);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
nError1 = testFile.setPos(osl_Pos_Current, 0);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
@@ -2486,7 +2486,7 @@ namespace osl_File
nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
- nError1 = testFile.setPos(osl_Pos_Absolute, 26);
+ nError1 = testFile.setPos(osl_Pos_Absolut, 26);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
nError1 = testFile.getPos(nFilePointer);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
@@ -2566,7 +2566,7 @@ namespace osl_File
auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
- nError1 = testFile.setPos(osl_Pos_Absolute, 0);
+ nError1 = testFile.setPos(osl_Pos_Absolut, 0);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
*pEOF = false;
@@ -2745,7 +2745,7 @@ namespace osl_File
auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
- nError1 = testFile.setPos(osl_Pos_Absolute, 26);
+ nError1 = testFile.setPos(osl_Pos_Absolut, 26);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
sal_uInt64 nCount_read = 0;
nError1 = testFile.read(buffer_read, 26, nCount_read);
@@ -2806,7 +2806,7 @@ namespace osl_File
nError1 = testFile.getPos(nFilePointer);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
// reset pointer to the beginning;
- nError1 = testFile.setPos(osl_Pos_Absolute, 0);
+ nError1 = testFile.setPos(osl_Pos_Absolut, 0);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
nError1 = testFile.read(buffer_read, 10, nCount_read);
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);