dmitryh 2004/06/02 17:55:03
Modified: c/src/xalanc/PlatformSupport DirectoryEnumerator.hpp
Log:
Cleaning of code related to Conf
Revision Changes Path
1.10 +5 -33
xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
Index: DirectoryEnumerator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DirectoryEnumerator.hpp 26 May 2004 17:39:21 -0000 1.9
+++ DirectoryEnumerator.hpp 3 Jun 2004 00:55:03 -0000 1.10
@@ -143,10 +143,6 @@
*/
bool isDirectory() const
{
-#if defined(OS390) || defined(OS400) || defined(TRU64)
- return false;
-
-#elif defined(AIX) || defined(SOLARIS) || defined(LINUX) || defined(HPUX) ||
defined(CYGWIN)
struct stat stat_Info;
int retCode = stat (d_name, &stat_Info);
@@ -157,34 +153,13 @@
throw XalanStatDirectoryException( XalanDOMString(d_name),
errno );
}
- if ( S_ISDIR(stat_Info.st_mode) == 1 )
- {
- return true;
- }
- else
- {
- return false;
- }
-
-
-#else
- if (d_type == DT_DIR || d_type == DT_UNKNOWN)
- {
- return true;
- }
- else
- {
- return false;
- }
-#endif
+ return S_ISDIR(stat_Info.st_mode);
+
}
bool
isSelfOrParent() const
- {
-#if defined(OS390) || defined(OS400) || defined(TRU64)
- return false;
-#else
+ {
if (isDirectory() == false)
{
return false;
@@ -209,7 +184,6 @@
{
return false;
}
-#endif
}
};
@@ -304,7 +278,7 @@
}
-#elif defined(AIX) || defined(SOLARIS) || defined(LINUX) || defined(HPUX) ||
defined(CYGWIN)
+#else
CharVectorType theTargetVector;
@@ -409,9 +383,7 @@
closedir(theDirectory);
}
}
-#else
- // Do nothing for now...
- // Unsupported platform!!!
+
#endif
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
