Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
2684858c
Kaydet (Commit)
2684858c
authored
Haz 04, 2013
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fix build, bad merge
Change-Id: I153b5ac4c2c75aca055ef49920cbccf3bd7720d4
üst
3b55196f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
ftpurl.cxx
ucb/source/ucp/ftp/ftpurl.cxx
+4
-1
fd_inputstream.cxx
ucbhelper/source/provider/fd_inputstream.cxx
+8
-5
No files found.
ucb/source/ucp/ftp/ftpurl.cxx
Dosyayı görüntüle @
2684858c
...
@@ -411,7 +411,10 @@ oslFileHandle FTPURL::open()
...
@@ -411,7 +411,10 @@ oslFileHandle FTPURL::open()
CURLcode
err
=
curl_easy_perform
(
curl
);
CURLcode
err
=
curl_easy_perform
(
curl
);
if
(
err
==
CURLE_OK
)
if
(
err
==
CURLE_OK
)
osl_setFilePos
(
res
,
osl_Pos_Absolut
,
0
);
{
oslFileError
rc
=
osl_setFilePos
(
res
,
osl_Pos_Absolut
,
0
);
SAL_WARN_IF
(
rc
!=
osl_File_E_None
,
"ucb"
,
"osl_setFilePos failed"
);
}
else
{
else
{
osl_closeFile
(
res
),
res
=
0
;
osl_closeFile
(
res
),
res
=
0
;
throw
curl_exception
(
err
);
throw
curl_exception
(
err
);
...
...
ucbhelper/source/provider/fd_inputstream.cxx
Dosyayı görüntüle @
2684858c
...
@@ -28,7 +28,7 @@ using namespace com::sun::star::io;
...
@@ -28,7 +28,7 @@ using namespace com::sun::star::io;
namespace
ucbhelper
namespace
ucbhelper
{
{
FdInputStream
::
:
FdInputStream
:
(
oslFileHandle
tmpfl
)
FdInputStream
::
FdInputStream
(
oslFileHandle
tmpfl
)
:
m_tmpfl
(
tmpfl
)
:
m_tmpfl
(
tmpfl
)
,
m_nLength
(
0
)
,
m_nLength
(
0
)
{
{
...
@@ -41,7 +41,8 @@ namespace ucbhelper
...
@@ -41,7 +41,8 @@ namespace ucbhelper
sal_uInt64
nFileSize
=
0
;
sal_uInt64
nFileSize
=
0
;
if
(
osl_getFilePos
(
m_tmpfl
,
&
nFileSize
)
==
osl_File_E_None
)
if
(
osl_getFilePos
(
m_tmpfl
,
&
nFileSize
)
==
osl_File_E_None
)
m_nLength
=
nFileSize
;
m_nLength
=
nFileSize
;
osl_setFilePos
(
m_tmpfl
,
osl_Pos_Absolut
,
0
);
oslFileError
rc
=
osl_setFilePos
(
m_tmpfl
,
osl_Pos_Absolut
,
0
);
SAL_WARN_IF
(
rc
!=
osl_File_E_None
,
"ucbhelper"
,
"osl_setFilePos failed"
);
}
}
}
}
...
@@ -101,7 +102,8 @@ namespace ucbhelper
...
@@ -101,7 +102,8 @@ namespace ucbhelper
if
(
!
m_tmpfl
)
if
(
!
m_tmpfl
)
throw
IOException
();
throw
IOException
();
osl_setFilePos
(
m_tmpfl
,
osl_Pos_Current
,
nBytesToSkip
);
oslFileError
rc
=
osl_setFilePos
(
m_tmpfl
,
osl_Pos_Current
,
nBytesToSkip
);
SAL_WARN_IF
(
rc
!=
osl_File_E_None
,
"ucbhelper"
,
"osl_setFilePos failed"
);
}
}
...
@@ -123,7 +125,7 @@ namespace ucbhelper
...
@@ -123,7 +125,7 @@ namespace ucbhelper
{
{
osl
::
MutexGuard
aGuard
(
m_aMutex
);
osl
::
MutexGuard
aGuard
(
m_aMutex
);
if
(
m_tmpfl
)
if
(
m_tmpfl
)
fclos
e
(
m_tmpfl
),
m_tmpfl
=
0
;
osl_closeFil
e
(
m_tmpfl
),
m_tmpfl
=
0
;
}
}
...
@@ -137,7 +139,8 @@ namespace ucbhelper
...
@@ -137,7 +139,8 @@ namespace ucbhelper
if
(
!
m_tmpfl
)
if
(
!
m_tmpfl
)
throw
IOException
();
throw
IOException
();
fseek
(
m_tmpfl
,
long
(
location
),
SEEK_SET
);
oslFileError
rc
=
osl_setFilePos
(
m_tmpfl
,
osl_Pos_Absolut
,
location
);
SAL_WARN_IF
(
rc
!=
osl_File_E_None
,
"ucbhelper"
,
"osl_setFilePos failed"
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment