[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / os2 / dir.cpp

diff --git a/src/os2/dir.cpp b/src/os2/dir.cpp
index 70b0ab2554a3a67d3249b9e859adcd43078ee121..e0eb0cbb163a7631a5051f31714e9a7e52dd8388 100644 (file)
--- a/src/os2/dir.cpp
+++ b/src/os2/dir.cpp
@@ -76,19 +76,19 @@ static inline FIND_DATA FindFirst(
 )
 {
     ULONG                       ulFindCount = 1;
 )
 {
     ULONG                       ulFindCount = 1;

-    FIND_DATA                   hDir;
+    FIND_DATA                   hDir = HDIR_CREATE;

     FIND_ATTR                   rc;
 
     FIND_ATTR                   rc;
 

-    rc = ::DosFindFirst( rsSpec.c_str()
+    rc = ::DosFindFirst( (PSZ)rsSpec.c_str()

                         ,&hDir
                         ,&hDir

-                        ,FILE_NORMAL
+                        ,0x37 // was: FILE_NORMAL

                         ,pFinddata
                         ,sizeof(FILEFINDBUF3)
                         ,&ulFindCount
                         ,FIL_STANDARD
                        );
     if (rc != 0)
                         ,pFinddata
                         ,sizeof(FILEFINDBUF3)
                         ,&ulFindCount
                         ,FIL_STANDARD
                        );
     if (rc != 0)

-        return 0;
+        return InitFindData();

     return hDir;
 }
 
     return hDir;
 }
 


@@ -103,14 +103,14 @@ static inline bool FindNext(
                          ,pFinddata
                          ,sizeof(FILEFINDBUF3)
                          ,&ulFindCount
                          ,pFinddata
                          ,sizeof(FILEFINDBUF3)
                          ,&ulFindCount

-                         ) != 0;
+                         ) == 0;

 }
 
 static const wxChar* GetNameFromFindData(
   FIND_STRUCT*                      pFinddata
 )
 {
 }
 
 static const wxChar* GetNameFromFindData(
   FIND_STRUCT*                      pFinddata
 )
 {

-    return pFinddata->achName;
+    return (wxChar*)pFinddata->achName;

 }
 
 static const FIND_ATTR GetAttrFromFindData(
 }
 
 static const FIND_ATTR GetAttrFromFindData(


@@ -213,7 +213,7 @@ bool wxDirData::Read(
   wxString*                         psFilename
 )
 {
   wxString*                         psFilename
 )
 {

-    bool                            bFirst = FALSE;
+    bool                            bFirst = false;

 
     FILEFINDBUF3                    vFinddata;
     #define PTR_TO_FINDDATA (&vFinddata)
 
     FILEFINDBUF3                    vFinddata;
     #define PTR_TO_FINDDATA (&vFinddata)


@@ -234,12 +234,12 @@ bool wxDirData::Read(
         m_vFinddata = FindFirst( sFilespec
                                 ,PTR_TO_FINDDATA
                                );
         m_vFinddata = FindFirst( sFilespec
                                 ,PTR_TO_FINDDATA
                                );

-        bFirst = TRUE;
+        bFirst = true;

     }
 
     if ( !IsFindDataOk(m_vFinddata) )
     {
     }
 
     if ( !IsFindDataOk(m_vFinddata) )
     {

-        return FALSE;
+        return false;

     }
 
     const wxChar*                   zName;
     }
 
     const wxChar*                   zName;


@@ -249,7 +249,7 @@ bool wxDirData::Read(
     {
         if (bFirst)
         {
     {
         if (bFirst)
         {

-            bFirst = FALSE;
+            bFirst = false;

         }
         else
         {
         }
         else
         {


@@ -257,7 +257,7 @@ bool wxDirData::Read(
                           ,PTR_TO_FINDDATA
                          ))
             {
                           ,PTR_TO_FINDDATA
                          ))
             {

-                return FALSE;
+                return false;

             }
         }
 
             }
         }
 


@@ -309,7 +309,7 @@ bool wxDirData::Read(
         *psFilename = zName;
         break;
     }
         *psFilename = zName;
         break;
     }

-    return TRUE;
+    return true;

 } // end of wxDirData::Read
 
 // ----------------------------------------------------------------------------
 } // end of wxDirData::Read
 
 // ----------------------------------------------------------------------------


@@ -321,7 +321,7 @@ bool wxDir::Exists(
   const wxString&                   rsDir
 )
 {
   const wxString&                   rsDir
 )
 {

-    return wxPathExists(rsDir);
+    return wxDirExists(rsDir);

 } // end of wxDir::Exists
 
 // ----------------------------------------------------------------------------
 } // end of wxDir::Exists
 
 // ----------------------------------------------------------------------------


@@ -343,7 +343,7 @@ bool wxDir::Open(
 {
     delete M_DIR;
     m_data = new wxDirData(rsDirname);
 {
     delete M_DIR;
     m_data = new wxDirData(rsDirname);

-    return TRUE;
+    return true;

 } // end of wxDir::Open
 
 bool wxDir::IsOpened() const
 } // end of wxDir::Open
 
 bool wxDir::IsOpened() const


@@ -388,7 +388,7 @@ bool wxDir::GetFirst(
 , int                               nFlags
 ) const
 {
 , int                               nFlags
 ) const
 {

-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );

     M_DIR->Rewind();
     M_DIR->SetFileSpec(rsFilespec);
     M_DIR->SetFlags(nFlags);
     M_DIR->Rewind();
     M_DIR->SetFileSpec(rsFilespec);
     M_DIR->SetFlags(nFlags);


@@ -399,8 +399,8 @@ bool wxDir::GetNext(
   wxString*                         psFilename
 ) const
 {
   wxString*                         psFilename
 ) const
 {

-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
-    wxCHECK_MSG( psFilename, FALSE, _T("bad pointer in wxDir::GetNext()") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( psFilename, false, _T("bad pointer in wxDir::GetNext()") );

     return M_DIR->Read(psFilename);
 } // end of wxDir::GetNext
 
     return M_DIR->Read(psFilename);
 } // end of wxDir::GetNext