Merge pull request #137 from mpictor/review/embarcadero_fixes

mpictor · mpictor · commit 92d83ef14a0b · 2012-02-13T14:32:35.000-08:00
Review/embarcadero fixes
diff --git a/src/cleditor/STEPfile.cc b/src/cleditor/STEPfile.cc
@@ -2228,11 +2228,6 @@ Severity STEPfile::AppendFile( istream * in, bool useTechCor ) {
 
     SetFileIdIncrement();
     int total_insts = 0,  valid_insts = 0;
-#if defined(__MSVC__) || defined(__BORLAND__)
-    int exchange_file = -1;
-#else
-    __attribute__( ( unused ) ) int exchange_file = -1;
-#endif
 
     ReadTokenSeparator( *in );
     std::string keywd = GetKeyword( *in, "; #", _error );
@@ -2242,11 +2237,9 @@ Severity STEPfile::AppendFile( istream * in, bool useTechCor ) {
 
     if( !strncmp( const_cast<char *>( keywd.c_str() ), "ISO-10303-21",
                   strlen( const_cast<char *>( keywd.c_str() ) ) ) ) {
-        exchange_file = 1;
         SetFileType( VERSION_CURRENT );
     } else if( !strncmp( const_cast<char *>( keywd.c_str() ), "STEP_WORKING_SESSION",
                          strlen( const_cast<char *>( keywd.c_str() ) ) ) ) {
-        exchange_file = 0;
         if( _fileType != WORKING_SESSION ) {
             _error.AppendToUserMsg(
                 "Warning: Reading in file as Working Session file.\n" );
diff --git a/src/clutils/Str.cc b/src/clutils/Str.cc
@@ -96,6 +96,23 @@ const char * StrToConstant( const char * word, std::string & s ) {
     return const_cast<char *>( s.c_str() );
 }
 
+/**************************************************************//**
+ ** \fn  StrCmpIns (const char * str1, const char * str2)
+ ** \returns  Comparison result
+ ** Compares two strings case insensitive (lowercase).
+ ** Returns < 0  when str1 less then str2
+ **         == 0 when str1 equals str2
+ **         > 0  when str1 greater then str2
+ ******************************************************************/
+int StrCmpIns( const char * str1, const char * str2 ) {
+    char c1, c2;
+    while ((c1 = tolower(*str1)) == (c2 = tolower(*str2)) && c1 != '\0') {
+        str1++;
+        str2++;
+    }
+    return c1 - c2;
+}
+
 /**************************************************************//**
  ** \fn  PrettyTmpName (char * oldname)
  ** \returns  a new capitalized name in a static buffer
diff --git a/src/clutils/Str.h b/src/clutils/Str.h
@@ -21,23 +21,13 @@
 #include <string.h>
 #include <errordesc.h>
 
-
-//StrCmpIns - case-insensitive string compare. Original fct (replaced Sep 2011)
-//called PrettyTmpName(). Not doing so may affect sort order but that shouldn't hurt
-#if defined(__MSVC__)
-#define StrCmpIns(a,b) _stricmp(a,b)
-#elif defined(__BORLAND__)
-#define StrCmpIns(a,b) stricmp(a,b)
-#else
-#define StrCmpIns(a,b) strcasecmp(a,b)
-#endif
-
 SCL_UTILS_EXPORT char         ToLower( const char c );
 SCL_UTILS_EXPORT char         ToUpper( const char c );
 SCL_UTILS_EXPORT char    *    StrToLower( const char *, char * );
 SCL_UTILS_EXPORT const char * StrToLower( const char * word, std::string & s );
 SCL_UTILS_EXPORT const char * StrToUpper( const char * word, std::string & s );
 SCL_UTILS_EXPORT const char * StrToConstant( const char * word, std::string & s );
+SCL_UTILS_EXPORT int          StrCmpIns( const char *str1, const char *str2 );
 SCL_UTILS_EXPORT const char * PrettyTmpName( const char * oldname );
 SCL_UTILS_EXPORT char    *    PrettyNewName( const char * oldname );
 SCL_UTILS_EXPORT char    *    EntityClassName( char * oldname );
diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc
@@ -152,6 +152,9 @@ int main( int argc, char * argv[] ) {
     sfile.ReadExchangeFile( flnm );
     sfile.Error().PrintContents( cout );
 
+    if ( sfile.Error().severity() <= SEVERITY_INCOMPLETE )
+        exit(1);
+
     checkSchemaName( registry, sfile, ignoreErr );
 
     Severity readSev = sfile.Error().severity(); //otherwise, errors from reading will be wiped out by sfile.WriteExchangeFile()
