X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverUNV%2FUNV_Utilities.hxx;h=413ccfa5a254d4c23c0bbfd99c0dd174b13abdda;hb=9493563cbc59acba2b9b036bb22fb184f5be946d;hp=50a53a75f16112200b24896e4420aff7dac71c16;hpb=d9e7f2c591e37b3d87a58eb14b816698b7831383;p=modules%2Fsmesh.git

diff --git a/src/DriverUNV/UNV_Utilities.hxx b/src/DriverUNV/UNV_Utilities.hxx
index 50a53a75f..413ccfa5a 100644
--- a/src/DriverUNV/UNV_Utilities.hxx
+++ b/src/DriverUNV/UNV_Utilities.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -56,24 +56,27 @@ namespace UNV{
   {
     assert (in_file.good());
     assert (!ds_name.empty());
-    
+
     std::string olds, news;
-    
+
     in_file.seekg(0);
-    while(true){
+    while(true)
+    {
       in_file >> olds >> news;
       /*
        * a "-1" followed by a number means the beginning of a dataset
        * stop combing at the end of the file
        */
-      while( ((olds != "-1") || (news == "-1") ) && !in_file.eof() ){     
+      while( ((olds != "-1") || (news == "-1")))
+      {
         olds = news;
         in_file >> news;
-      }
-      if(in_file.eof())
-      {
-        in_file.clear();
-        return false;
+
+        if ( in_file.eof() || in_file.fail() )
+        {
+          in_file.clear();
+          return false;
+        }
       }
       if (news == ds_name)
         return true;
@@ -128,15 +131,14 @@ namespace UNV{
    */
   inline std::string read_line(std::ifstream& in_stream, const bool next=true)
   {
-    char line[theMaxLineLen];
-    in_stream.getline( line, theMaxLineLen );
+    std::string resLine;
+    std::getline( in_stream, resLine );
     if ( next )
-      in_stream.getline( line, theMaxLineLen );
+      std::getline( in_stream, resLine );
 
-    std::string resLine = line;
     if ( resLine.size() > 0 && resLine[ resLine.size()-1 ] == '\r' )
       resLine.resize( resLine.size()-1 );
-    return line;
+    return resLine;
   }
 };