Merge branch 'master' of git.psi.ch:H5hut/src

COPYING

@@ -1,6 +1,6 @@
 *** Copyright Notice ***
 
-H5hut  Copyright (c) 2006-2010, The Regents of the University of California,
+H5hut  Copyright (c) 2006-2016, The Regents of the University of California,
 through Lawrence Berkeley National Laboratory (subject to receipt of any
 required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
 Institut (Switzerland).  All rights reserved.
@@ -25,7 +25,7 @@ and to permit others to do so.
 
 *** License agreement ***
 
-H5Part  Copyright (c) 2006-2009, The Regents of the University of California,
+H5hut  Copyright (c) 2006-2016, The Regents of the University of California,
 through Lawrence Berkeley National Laboratory (subject to receipt of any
 required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
 Institut (Switzerland).  All rights reserved.

src/C/Makefile.am

@@ -3,11 +3,6 @@ if ENABLE_C
 # Header files that I wish to install in $(prefix)/include
 include_HEADERS =					\
 	$(top_srcdir)/src/include/H5.h			\
-	$(top_srcdir)/src/include/H5_attribs.h		\
-	$(top_srcdir)/src/include/H5_model.h		\
-	$(top_srcdir)/src/include/H5Part.h		\
-	$(top_srcdir)/src/include/H5Part_io.h		\
-	$(top_srcdir)/src/include/H5Part_model.h	\
 	$(top_srcdir)/src/include/H5Block.h		\
 	$(top_srcdir)/src/include/H5Block_attribs.h	\
 	$(top_srcdir)/src/include/H5Block_io.h		\
@@ -18,6 +13,16 @@ include_HEADERS =					\
 	$(top_srcdir)/src/include/H5Fed_retrieve.h	\
 	$(top_srcdir)/src/include/H5Fed_store.h		\
 	$(top_srcdir)/src/include/H5Fed_tags.h		\
+	$(top_srcdir)/src/include/H5Part.h		\
+	$(top_srcdir)/src/include/H5Part_io.h		\
+	$(top_srcdir)/src/include/H5Part_model.h	\
+	$(top_srcdir)/src/include/H5_debug.h		\
+	$(top_srcdir)/src/include/H5_error.h		\
+	$(top_srcdir)/src/include/H5_file.h		\
+	$(top_srcdir)/src/include/H5_file_attribs.h	\
+	$(top_srcdir)/src/include/H5_log.h		\
+	$(top_srcdir)/src/include/H5_model.h		\
+	$(top_srcdir)/src/include/H5_step_attribs.h	\
 	$(top_srcdir)/src/include/H5hut.h
 
 # Listing of all possible headers that I may include

src/Fortran/H5.c

@@ -105,7 +105,7 @@ h5_setprop_file_corevfd (
                       "prop=%lld, increment=%lld",
                       (long long int)*_prop, (long long int)*increment);
         h5_prop_t prop = (h5_prop_t)*_prop;
-        H5_API_RETURN ((h5_int64_t)h5_set_prop_file_core_vfd (prop, increment));
+        H5_API_RETURN ((h5_int64_t)h5_set_prop_file_core_vfd (prop, *increment));
 }
 
 #define h5_setprop_file_align FC_MANGLING (  \

src/Fortran/Makefile.am

@@ -4,10 +4,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/include
 
 F90_FILES =						\
 	$(top_srcdir)/src/include/H5hut.f90		\
-	$(top_srcdir)/src/include/H5.f90		\
 	$(top_srcdir)/src/include/H5_const.f90		\
-	$(top_srcdir)/src/include/H5_attribs.f90	\
+	$(top_srcdir)/src/include/H5_file.f90		\
 	$(top_srcdir)/src/include/H5_model.f90		\
+	$(top_srcdir)/src/include/H5_attribs.f90	\
+	$(top_srcdir)/src/include/H5_debug.f90		\
+	$(top_srcdir)/src/include/H5_error.f90		\
 	$(top_srcdir)/src/include/H5Part_model.f90	\
 	$(top_srcdir)/src/include/H5Part_io.f90		\
 	$(top_srcdir)/src/include/H5Block_model.f90	\
@@ -50,7 +52,7 @@ $(top_srcdir)/src/include/H5hut.f: $(F90_FILES)
 	awk '/INTEGER\*8 FUNCTION/{print "       " $$1 " " $$3}' $^ >>$@
 
 all-local: $(top_srcdir)/src/include/H5hut.f
-	$(INSTALL) -m644 .libs/libH5hutF.a $(top_builddir)/src/lib
+
 endif
 
 clean: clean-am

src/h5core/Makefile.am

@@ -99,14 +99,9 @@ libH5hut_la_DEPENDENCIES = $(EXTRA_HEADERS)
 
 libH5hut_la_LDFLAGS = -version-info 2:0:0
 
-#all-local:
-#	$(INSTALL) -m0755 -d $(top_builddir)/src/lib
-#	$(INSTALL) -m644 .libs/libH5hut.a $(top_builddir)/src/lib
-
 install-exec-local:
 	@$(INSTALL) -d $(DESTDIR)$(includedir)/h5core
 	@$(INSTALL) -m644 $(top_srcdir)/src/include/h5core/*.h $(DESTDIR)$(includedir)/h5core/
 
 clean-local:
-	$(RM) -f $(top_srcdir)/src/lib/libH5hut.*
 	$(RM) -f *~

src/include/H5_const.f90

@@ -30,7 +30,7 @@
   INTEGER*8, PARAMETER :: H5_OK =                  H5_SUCCESS
   INTEGER*8, PARAMETER :: H5_NOK =                 -1
   INTEGER*8, PARAMETER :: H5_FAILURE =             -2
-  INTEGER*8, PARAMETER :: H5_FAILED =              H5_FAILED
+  INTEGER*8, PARAMETER :: H5_FAILED =              H5_FAILURE
   INTEGER*8, PARAMETER :: H5_ERR_BADF =            -9
   INTEGER*8, PARAMETER :: H5_ERR_NOMEM =           -12
   INTEGER*8, PARAMETER :: H5_ERR_INVAL =           -22

src/include/H5_debug.f90

@@ -28,7 +28,7 @@
      !! \see h5_get_debug_mask()
 
      SUBROUTINE h5_set_debug_mask ( mask )
-       INTEGER*9, INTEGER(IN) :: mask   !< [in] debug mask
+       INTEGER*8, INTENT(IN) :: mask   !< [in] debug mask
      END SUBROUTINE h5_set_debug_mask
 
      !>

src/include/H5hut.f90

@@ -11,8 +11,7 @@ MODULE H5hut
 
   include 'H5_file.f90'
   include 'H5_model.f90'
-  include 'H5_file_attribs.f90'
-  include 'H5_step_attribs.f90'
+  include 'H5_attribs.f90'
   include 'H5_log.f90'
   include 'H5_debug.f90'
   include 'H5_error.f90'