Updated copyright comment

[modules/kernel.git] / src / HDFPersist / HDFfile.cc

diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc
index 3f5e0e1a1f7e42771e7b4893ad563b4effecd39a..9da12465f6bb948604d49ffa9fd78e7153b1ace5 100644 (file)
--- a/src/HDFPersist/HDFfile.cc
+++ b/src/HDFPersist/HDFfile.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -37,7 +37,7 @@
 #include "HDFfile.hxx"
 #include "HDFexception.hxx"
 
-herr_t file_attr(hid_t loc_id, const char *attr_name, void *operator_data)
+herr_t file_attr(hid_t /*loc_id*/, const char *attr_name, void *operator_data)
 {
    *(char**)operator_data = new char[strlen(attr_name)+1];
    strcpy(*(char**)operator_data, attr_name);
@@ -58,29 +58,36 @@ void HDFfile::CreateOnDisk()
 
 void HDFfile::OpenOnDisk(hdf_access_mode access_mode)
 {
-  _access_mode = access_mode;
+       _access_mode = access_mode;
+       std::string msgerr;
 
-  switch (_access_mode)
-    {
-    case HDF_RDWR :
-      if (access(_name,F_OK))
+       switch (_access_mode)
        {
-         if ((_id = HDFfileCreate(_name)) < 0) 
-           throw HDFexception("Can't open HDF file");
+       case HDF_RDWR:
+               if (access(_name, F_OK))
+               {
+                       if ((_id = HDFfileCreate(_name)) < 0) {
+                               msgerr = "Can't create HDF in RW mode file" + std::string(_name);
+                               throw HDFexception(msgerr.c_str());
+                       }
+               }
+               else if ((_id = HDFfileOpen(_name, _access_mode)) < 0) {
+                       msgerr = "Can't open HDF in RW mode file " + std::string(_name);
+                       throw HDFexception(msgerr.c_str());
+               }
+               break;
+
+       case HDF_RDONLY:
+               if ((_id = HDFfileOpen(_name, _access_mode)) < 0) {
+                       msgerr = "Can't open HDF in RO mode file " + std::string(_name);
+                       throw HDFexception(msgerr.c_str());
+               }
+               break;
+
+       default:
+               msgerr = "Can't open HDF file " + std::string(_name) + " : bad access option";
+               throw HDFexception(msgerr.c_str());
        }
-      else
-       if ((_id = HDFfileOpen(_name,_access_mode)) < 0)
-         throw HDFexception("Can't open HDF file");
-      break;
-      
-    case HDF_RDONLY :
-      if ((_id = HDFfileOpen(_name,_access_mode)) < 0)
-       throw HDFexception("Can't open HDF file");
-      break;
-      
-    default :
-      throw HDFexception("Can't open HDF file : bad access option");
-    }
 }
 
 void HDFfile::CloseOnDisk()