X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverUNV%2FUNV_Utilities.hxx;h=3346f7c92bb0610eede7a11225cc37be597f9d01;hb=b8ddb1330cad42ad5381912dd267d1e39182daae;hp=1e0f42f5b57eadc8eb50c417b492455fa47c41db;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;p=modules%2Fsmesh.git

diff --git a/src/DriverUNV/UNV_Utilities.hxx b/src/DriverUNV/UNV_Utilities.hxx
index 1e0f42f5b..3346f7c92 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-2019  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
@@ -20,8 +20,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef MED_Utilities_HeaderFile
-#define MED_Utilities_HeaderFile
+#ifndef UNV_Utilities_HeaderFile
+#define UNV_Utilities_HeaderFile
 
 #include "SMESH_DriverUNV.hxx"
 
@@ -33,10 +33,9 @@
 #include <cassert>
 #include <cstdlib>
 
-namespace UNV{
-  using namespace std;
+namespace UNV {
 
-  const size_t theMaxLineLen = 80;
+  const size_t theMaxLineLen = 82; // 80 for text + 2 for "\r\n"
 
   class MESHDRIVERUNV_EXPORT PrefixPrinter{
     static int myCounter;
@@ -44,11 +43,11 @@ namespace UNV{
     PrefixPrinter();
     ~PrefixPrinter();
 
-    static string GetPrefix();
+    static std::string GetPrefix();
   };
 
   /**
-   * @returns \p false when error occured, \p true otherwise.
+   * @returns \p false when error occurred, \p true otherwise.
    * Adjusts the \p in_stream to the beginning of the
    * dataset \p ds_name.
    */
@@ -56,27 +55,32 @@ 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;
+
+      olds.clear();
     }
     // should never end up here
     return false;
@@ -90,17 +94,17 @@ namespace UNV{
    */
   inline double D_to_e(std::string& number)
   {
-    /* find "D" in string, start looking at 
+    /* find "D" in string, start looking at
      * 6th element, to improve speed.
-     * We dont expect a "D" earlier
+     * We don't expect a "D" earlier
      */
-    const int position = number.find("D",6);
-    if(position != std::string::npos){
-      number.replace(position, 1, "e"); 
-    }
+    const size_t position = number.find("D",6);
+    if ( position != std::string::npos )
+      number.replace(position, 1, "e");
+
     return atof (number.c_str());
   }
-  
+
   /**
    * @returns \p false when file is incorrect, \p true otherwise.
    * Check file with name \p theFileName for correct terminate
@@ -128,15 +132,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;
   }
 };