more type-safety

[wxWidgets.git] / src / common / file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index f563a5cd3db44264b56468ca01dca14f8ae169c8..2cdd6e8e7cebb78bc6964fac7f28f8b991a6acea 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -20,14 +20,15 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#include "wx/defs.h"

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-    #pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_FILE
+

 // standard
 // standard

-#if   defined(__WXMSW__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__)

   #include  <io.h>
 
 #ifndef __SALFORDC__
   #include  <io.h>
 
 #ifndef __SALFORDC__


@@ -160,7 +161,7 @@ bool wxFile::Exists(const wxChar *name)
 {
     struct stat st;
 #if wxUSE_UNICODE && wxMBFILES
 {
     struct stat st;
 #if wxUSE_UNICODE && wxMBFILES

-    wxCharBuffer fname = wxConv_file.cWC2MB(name);
+    wxCharBuffer fname = wxConvFile.cWC2MB(name);

 
     return !access(fname, 0) &&
            !stat(MBSTRINGCAST fname, &st) &&
 
     return !access(fname, 0) &&
            !stat(MBSTRINGCAST fname, &st) &&


@@ -205,12 +206,6 @@ wxFile::wxFile(const wxChar *szFileName, OpenMode mode)
     Open(szFileName, mode);
 }
 
     Open(szFileName, mode);
 }
 

-// dtor
-wxFile::~wxFile()
-{
-    Close();
-}
-

 // create the file, fail if it already exists and bOverwrite
 bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
 {
 // create the file, fail if it already exists and bOverwrite
 bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
 {


@@ -349,25 +344,25 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

-    int flag = -1;
+    int origin;

     switch ( mode ) {
     switch ( mode ) {

+        default:
+            wxFAIL_MSG(_("unknown seek origin"));
+

         case wxFromStart:
         case wxFromStart:

-            flag = SEEK_SET;
+            origin = SEEK_SET;

             break;
 
         case wxFromCurrent:
             break;
 
         case wxFromCurrent:

-            flag = SEEK_CUR;
+            origin = SEEK_CUR;

             break;
 
         case wxFromEnd:
             break;
 
         case wxFromEnd:

-            flag = SEEK_END;
+            origin = SEEK_END;

             break;
             break;

-
-        default:
-            wxFAIL_MSG(_("unknown seek origin"));

     }
 
     }
 

-    int iRc = lseek(m_fd, ofs, flag);
+    int iRc = lseek(m_fd, ofs, origin);

     if ( iRc == -1 ) {
         wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
         return wxInvalidOffset;
     if ( iRc == -1 ) {
         wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
         return wxInvalidOffset;


@@ -502,7 +497,7 @@ bool wxTempFile::Open(const wxString& strName)
     int access = wxS_DEFAULT;
 #ifdef __UNIX__
     // create the file with the same mode as the original one under Unix
     int access = wxS_DEFAULT;
 #ifdef __UNIX__
     // create the file with the same mode as the original one under Unix

-    mode_t umaskOld;
+    mode_t umaskOld = 0; // just to suppress compiler warning

     bool changedUmask;
 
     struct stat st;
     bool changedUmask;
 
     struct stat st;


@@ -523,11 +518,11 @@ bool wxTempFile::Open(const wxString& strName)
     {
         // file probably didn't exist, just create with default mode _using_
         // user's umask (new files creation should respet umask)
     {
         // file probably didn't exist, just create with default mode _using_
         // user's umask (new files creation should respet umask)

-        changedUmask = TRUE;
+        changedUmask = FALSE;

     }
 #endif // Unix
 
     }
 #endif // Unix
 

-    bool ok =  m_file.Open(m_strTemp, wxFile::write, access);
+    bool ok = m_file.Open(m_strTemp, wxFile::write, access);

 
 #ifdef __UNIX__
     if ( changedUmask )
 
 #ifdef __UNIX__
     if ( changedUmask )


@@ -573,3 +568,6 @@ void wxTempFile::Discard()
     if ( remove(m_strTemp.fn_str()) != 0 )
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
 }
     if ( remove(m_strTemp.fn_str()) != 0 )
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
 }

+
+#endif
+