Merge branch 'issue-421' of ssh://github.com/nexusformat/code into is…

…sue-421 Refs #421 Conflicts: src/napi5.c
nexusformat · Jul 12, 2016 · 4a69468 · 4a69468
2 parents 523a52a + 0929e8b
commit 4a69468
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 19 deletions.
diff --git a/include/napi5.h b/include/napi5.h
@@ -5,7 +5,6 @@
 
 /* Hide deprecated API from HDF5 versions before 1.8
  * Required to build on Ubuntu 12.04 */
-#define H5_NO_DEPRECATED_SYMBOLS
 
 #include <hdf5.h>
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -59,6 +59,7 @@ endif(WITH_HDF4)
 #-----------------------------------------------------------------------------
 if (WITH_HDF5)
   set (NAPISRC ${NAPISRC} napi5.c)
+  add_definitions(-DH5_USE_18_API=1)
   include_directories(${HDF5_INCLUDE_DIRS})
   link_directories(${HDF5_LIBRARY_DIRS})
 endif (WITH_HDF5)

diff --git a/src/napi5.c b/src/napi5.c
@@ -275,31 +275,57 @@ NXstatus NX5open(CONSTCHAR * filename, NXaccess am, NXhandle * pHandle)
 		return NX_ERROR;
 	}
 	memset(pNew, 0, sizeof(NexusFile5));
+
+    /* create file access property list - required in all cases*/
+    if((fapl = H5Pcreate(H5P_FILE_ACCESS))<0){
+        sprintf(pBuffer,"Error: failed to create file access property "
+                        "list for file %s",filename);
+        NXReportError(pBuffer);
+        free(pNew);
+        return NX_ERROR;
+    }
+
+    /* set file close policy - need this in all cases*/
+    if(H5Pset_fclose_degree(fapl, H5F_CLOSE_STRONG)<0){
+        sprintf(pBuffer,"Error: cannot set close policy for file "
+                        "%s",filename);
+        NXReportError(pBuffer);
+        free(pNew);
+        return NX_ERROR;
+    }
 
 	/* start HDF5 interface */
 	if (am == NXACC_CREATE5) {
-		fapl = H5Pcreate(H5P_FILE_ACCESS);
-		H5Pget_cache(fapl, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes,
-			     &rdcc_w0);
+		if(H5Pget_cache(fapl, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes,
+                        &rdcc_w0) < 0){
+            sprintf(pBuffer,"Error: cannot obtain HDF5 cache size"
+                            " for file %s",filename);
+            NXReportError(pBuffer);
+            free(pNew);
+            return NX_ERROR;
+        }
+
 		rdcc_nbytes = (size_t) nx_cacheSize;
-		H5Pset_cache(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes,
-			     rdcc_w0);
-		H5Pset_fclose_degree(fapl, H5F_CLOSE_STRONG);
+		if(H5Pset_cache(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes,
+			            rdcc_w0) < 0){
+            sprintf(pBuffer,"Error: cannot set cache size "
+                            "for file %s",filename);
+            NXReportError(pBuffer);
+            free(pNew);
+            return NX_ERROR;
+        }
+
 		am1 = H5F_ACC_TRUNC;
 		pNew->iFID = H5Fcreate(filename, am1, H5P_DEFAULT, fapl);
 	} else {
-		if (am == NXACC_READ) {
-			am1 = H5F_ACC_RDONLY;
-		} else {
-			am1 = H5F_ACC_RDWR;
-		}
-		fapl = H5Pcreate(H5P_FILE_ACCESS);
-		H5Pset_fclose_degree(fapl, H5F_CLOSE_STRONG);
+		if (am == NXACC_READ) am1 = H5F_ACC_RDONLY;
+		else                  am1 = H5F_ACC_RDWR;
+
 		pNew->iFID = H5Fopen(filename, am1, fapl);
 	}
-	if (fapl != -1) {
-		H5Pclose(fapl);
-	}
+
+	if (fapl != -1) H5Pclose(fapl); /*close file access property list*/ 
+
 	if (pNew->iFID <= 0) {
 		sprintf(pBuffer, "ERROR: cannot open file: %s", filename);
 		NXReportError(pBuffer);
@@ -477,7 +503,7 @@ NXstatus NX5close(NXhandle * fid)
 NXstatus NX5makegroup(NXhandle fid, CONSTCHAR * name, CONSTCHAR * nxclass)
 {
 	pNexusFile5 pFile;
-	herr_t iRet;
+	hid_t iRet;
 	hid_t iVID;
 	hid_t attr1, aid1, aid2;
 	char pBuffer[1024] = "";
@@ -710,7 +736,7 @@ NXstatus NX5compmakedata64(NXhandle fid, CONSTCHAR * name,
 			   int rank, int64_t dimensions[],
 			   int compress_type, int64_t chunk_size[])
 {
-    hid_t datatype1, dataspace, iNew, dID;
+        hid_t datatype1, dataspace, iNew, dID;
 	herr_t iRet;
 	hid_t type, cparms = -1;
 	pNexusFile5 pFile;
@@ -1056,6 +1082,7 @@ NXstatus NX5putattr(NXhandle fid, CONSTCHAR * name, const void *data,
 	pNexusFile5 pFile;
 	hid_t attr1, aid1, aid2;
 	hid_t type;
+    hid_t attr_id;
 	herr_t iRet;
 	hid_t vid, attRet;