Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* New wxStream classes: wxStreamBuffer and wxObject*Stream.

Browse Source 
* Changes: ofsInvalid => wxInvalidOffset in filefn.h
* Updates: all wxStream classes use wxStreamBuffer.
           wxObject basic declaration changes (added LoadObject, modified
           StoreObject)
* Some base of the serialization.
(I hope not to have forgotten any files)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-07-24 17:13:47 +00:00
parent 439b3bf1f5
commit 1678ad7802
13 changed files with 324 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/common/file.cpp
View File

@@ -143,7 +143,7 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
int fd = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
if ( fd == -1 ) {
wxLogSysError(_("can't create file '%s'"), szFileName);
wxLogSysError("can't create file '%s'", szFileName);
return FALSE;
}
else {
@@ -178,7 +178,7 @@ bool wxFile::Open(const char *szFileName, OpenMode mode, int access)
int fd = open(szFileName, flags, access);
if ( fd == -1 ) {
wxLogSysError(_("can't open file '%s'"), szFileName);
wxLogSysError("can't open file '%s'", szFileName);
return FALSE;
}
else {
@@ -192,7 +192,7 @@ bool wxFile::Close()
{
if ( IsOpened() ) {
if ( close(m_fd) == -1 ) {
wxLogSysError(_("can't close file descriptor %d"), m_fd);
wxLogSysError("can't close file descriptor %d", m_fd);
m_fd = fd_invalid;
return FALSE;
}
@@ -214,8 +214,8 @@ off_t wxFile::Read(void *pBuf, off_t nCount)
int iRc = ::read(m_fd, pBuf, nCount);
if ( iRc == -1 ) {
wxLogSysError(_("can't read from file descriptor %d"), m_fd);
return ofsInvalid;
wxLogSysError("can't read from file descriptor %d", m_fd);
return wxInvalidOffset;
}
else
return (uint)iRc;
@@ -228,22 +228,22 @@ uint wxFile::Write(const void *pBuf, uint nCount)
int iRc = ::write(m_fd, pBuf, nCount);
if ( iRc == -1 ) {
wxLogSysError(_("can't write to file descriptor %d"), m_fd);
wxLogSysError("can't write to file descriptor %d", m_fd);
m_error = TRUE;
return 0;
}
else
return (uint)iRc;
return iRc;
}
// flush
bool wxFile::Flush()
{
if ( IsOpened() ) {
// @@@ fsync() is not ANSI (BSDish)
// @@@ fsync() is not ANSI (BSDish)
// if ( fsync(m_fd) == -1 ) { // TODO
if (TRUE) {
wxLogSysError(_("can't flush file descriptor %d"), m_fd);
wxLogSysError("can't flush file descriptor %d", m_fd);
return FALSE;
}
}
@@ -280,8 +280,8 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
int iRc = lseek(m_fd, ofs, flag);
if ( iRc == -1 ) {
wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
return ofsInvalid;
wxLogSysError("can't seek on file descriptor %d", m_fd);
return wxInvalidOffset;
}
else
return (off_t)iRc;
@@ -294,8 +294,8 @@ off_t wxFile::Tell() const
int iRc = tell(m_fd);
if ( iRc == -1 ) {
wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
return ofsInvalid;
wxLogSysError("can't get seek position on file descriptor %d", m_fd);
return wxInvalidOffset;
}
else
return (off_t)iRc;
@@ -327,8 +327,8 @@ off_t wxFile::Length() const
#endif //_MSC_VER
if ( iRc == -1 ) {
wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
return ofsInvalid;
wxLogSysError("can't find length of file on file descriptor %d", m_fd);
return wxInvalidOffset;
}
else
return (off_t)iRc;
@@ -345,7 +345,7 @@ bool wxFile::Eof() const
// @@ this doesn't work, of course, on unseekable file descriptors
off_t ofsCur = Tell(),
ofsMax = Length();
if ( ofsCur == ofsInvalid || ofsMax == ofsInvalid )
if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
iRc = -1;
else
iRc = ofsCur == ofsMax;
@@ -361,8 +361,8 @@ bool wxFile::Eof() const
return FALSE;
case -1:
wxLogSysError(_("can't determine if the end of file is reached on "
"descriptor %d"), m_fd);
wxLogSysError("can't determine if the end of file is reached on "
"descriptor %d", m_fd);
break;
default:
@@ -424,12 +424,12 @@ bool wxTempFile::Commit()
m_file.Close();
if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) {
wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
wxLogSysError("can't remove file '%s'", m_strName.c_str());
return FALSE;
}
if ( rename(m_strTemp, m_strName) != 0 ) {
wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
wxLogSysError("can't commit changes to file '%s'", m_strName.c_str());
return FALSE;
}
@@ -440,5 +440,5 @@ void wxTempFile::Discard()
{
m_file.Close();
if ( remove(m_strTemp) != 0 )
wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
wxLogSysError("can't remove temporary file '%s'", m_strTemp.c_str());
}