summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt55
-rw-r--r--src/H5T.c1
-rw-r--r--src/H5config.h.in641
-rw-r--r--src/H5trace.c161
-rw-r--r--src/Makefile.in14
5 files changed, 119 insertions, 753 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc6ba0a..2aa43f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,8 +22,8 @@ set (H5_HDRS
${HDF5_SRC_DIR}/hdf5.h
${HDF5_SRC_DIR}/H5api_adpt.h
${HDF5_SRC_DIR}/H5public.h
- ${HDF5_SRC_DIR}/H5version.h
- ${HDF5_SRC_DIR}/H5overflow.h
+ #${HDF5_SRC_DIR}/H5version.h
+ #${HDF5_SRC_DIR}/H5overflow.h
)
IDE_GENERATED_PROPERTIES ("H5" "${H5_HDRS}" "${H5_SRCS}" )
@@ -133,12 +133,12 @@ set (H5E_SRCS
)
set (H5E_HDRS
- ${HDF5_SRC_DIR}/H5Edefin.h
- ${HDF5_SRC_DIR}/H5Einit.h
+ #${HDF5_SRC_DIR}/H5Edefin.h
+ #${HDF5_SRC_DIR}/H5Einit.h
${HDF5_SRC_DIR}/H5Epkg.h
- ${HDF5_SRC_DIR}/H5Epubgen.h
+ #${HDF5_SRC_DIR}/H5Epubgen.h
${HDF5_SRC_DIR}/H5Epublic.h
- ${HDF5_SRC_DIR}/H5Eterm.h
+ #${HDF5_SRC_DIR}/H5Eterm.h
)
IDE_GENERATED_PROPERTIES ("H5E" "${H5E_HDRS}" "${H5E_SRCS}" )
@@ -801,57 +801,66 @@ add_custom_command (
WORKING_DIRECTORY ${HDF5_BINARY_DIR}
)
-if (GENERATE_ERROR_HEADERS)
+if (HDF5_GENERATE_HEADERS)
find_package (Perl)
if (PERL_FOUND)
add_custom_command (
- OUTPUT ${HDF5_BINARY_DIR}/H5Edefin.h
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5Edefin.h ${CMAKE_CURRENT_BINARY_DIR}/H5Einit.h ${CMAKE_CURRENT_BINARY_DIR}/H5Epubgen.h ${CMAKE_CURRENT_BINARY_DIR}/H5Eterm.h
PRE_BUILD
COMMAND ${PERL_EXECUTABLE}
- ARGS ${HDF5_SOURCE_DIR}/bin/make_err ${HDF5_SOURCE_DIR}/src/H5err.txt
+ ARGS ${HDF5_SOURCE_DIR}/bin/make_err ${HDF5_SOURCE_DIR}/src/H5err.txt ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${HDF5_SOURCE_DIR}/src/H5err.txt
COMMENT " Creating err header"
)
add_custom_command (
- OUTPUT ${HDF5_BINARY_DIR}/H5version.h
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5version.h
PRE_BUILD
COMMAND ${PERL_EXECUTABLE}
- ARGS ${HDF5_SOURCE_DIR}/bin/make_vers ${HDF5_SOURCE_DIR}/src/H5vers.txt
+ ARGS ${HDF5_SOURCE_DIR}/bin/make_vers ${HDF5_SOURCE_DIR}/src/H5vers.txt ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${HDF5_SOURCE_DIR}/src/H5vers.txt
COMMENT " Creating API version macro"
)
add_custom_command (
- OUTPUT ${HDF5_BINARY_DIR}/H5overflow.h
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5overflow.h
PRE_BUILD
COMMAND ${PERL_EXECUTABLE}
- ARGS ${HDF5_SOURCE_DIR}/bin/make_overflow ${HDF5_SOURCE_DIR}/src/H5overflow.txt
+ ARGS ${HDF5_SOURCE_DIR}/bin/make_overflow ${HDF5_SOURCE_DIR}/src/H5overflow.txt ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${HDF5_SOURCE_DIR}/src/H5overflow.txt
COMMENT " Creating Assignment overflow macro"
)
add_custom_target(run_perl_scripts ALL
- DEPENDS ${HDF5_BINARY_DIR}/H5Edefin.h ${HDF5_BINARY_DIR}/H5version.h ${HDF5_BINARY_DIR}/H5overflow.h
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/H5Edefin.h ${CMAKE_CURRENT_BINARY_DIR}/H5version.h ${CMAKE_CURRENT_BINARY_DIR}/H5overflow.h
)
else (PERL_FOUND)
message (STATUS "Cannot generate headers - perl not found")
endif (PERL_FOUND)
-endif (GENERATE_ERROR_HEADERS)
+endif (HDF5_GENERATE_HEADERS)
#-----------------------------------------------------------------------------
# Add H5Tinit source to build - generated by H5Detect/CMake at configure time
#-----------------------------------------------------------------------------
set (common_SRCS ${common_SRCS} ${HDF5_BINARY_DIR}/H5Tinit.c)
-set_source_files_properties (${HDF5_BINARY_DIR}/H5Tinit.c GENERATED)
set (common_SRCS ${common_SRCS} ${HDF5_BINARY_DIR}/H5lib_settings.c)
-set_source_files_properties (${HDF5_BINARY_DIR}/H5lib_settings.c GENERATED)
-set (common_SRCS ${common_SRCS} ${HDF5_BINARY_DIR}/H5Edefin.h)
-set_source_files_properties (${HDF5_BINARY_DIR}/H5Edefin.h GENERATED)
-set (common_SRCS ${common_SRCS} ${HDF5_BINARY_DIR}/H5version.h)
-set_source_files_properties (${HDF5_BINARY_DIR}/H5version.h GENERATED)
-set (common_SRCS ${common_SRCS} ${HDF5_BINARY_DIR}/H5overflow.h)
-set_source_files_properties (${HDF5_BINARY_DIR}/H5overflow.h GENERATED)
+
+if (HDF5_GENERATE_HEADERS)
+ set (common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/H5Edefin.h)
+ set (common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/H5Einit.h)
+ set (common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/H5Epubgen.h)
+ set (common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/H5Eterm.h)
+ set (common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/H5version.h)
+ set (common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/H5overflow.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+else (HDF5_GENERATE_HEADERS)
+ set (common_SRCS ${common_SRCS} ${HDF5_SRC_DIR}/H5Edefin.h)
+ set (common_SRCS ${common_SRCS} ${HDF5_SRC_DIR}/H5Einit.h)
+ set (common_SRCS ${common_SRCS} ${HDF5_SRC_DIR}/H5Epubgen.h)
+ set (common_SRCS ${common_SRCS} ${HDF5_SRC_DIR}/H5Eterm.h)
+ set (common_SRCS ${common_SRCS} ${HDF5_SRC_DIR}/H5version.h)
+ set (common_SRCS ${common_SRCS} ${HDF5_SRC_DIR}/H5overflow.h)
+endif (HDF5_GENERATE_HEADERS)
add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS})
TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC " " " ")
diff --git a/src/H5T.c b/src/H5T.c
index e1051f2..c51e78e 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1214,6 +1214,7 @@ H5T__init_package(void)
status |= H5T_register(H5T_PERS_HARD, "dbl_uint", native_double, native_uint, H5T__conv_double_uint, H5AC_ind_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "ldbl_uint", native_ldouble, native_uint, H5T__conv_ldouble_uint, H5AC_ind_dxpl_id, FALSE);
+ /* From floats to long */
status |= H5T_register(H5T_PERS_HARD, "flt_long", native_float, native_long, H5T__conv_float_long, H5AC_ind_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "dbl_long", native_double, native_long, H5T__conv_double_long, H5AC_ind_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "ldbl_long", native_ldouble, native_long, H5T__conv_ldouble_long, H5AC_ind_dxpl_id, FALSE);
diff --git a/src/H5config.h.in b/src/H5config.h.in
deleted file mode 100644
index 9363813..0000000
--- a/src/H5config.h.in
+++ /dev/null
@@ -1,641 +0,0 @@
-/* src/H5config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Define if the memory buffers being written to disk should be cleared before
- writing. */
-#undef CLEAR_MEMORY
-
-/* Define if C++ compiler recognizes offsetof */
-#undef CXX_HAVE_OFFSETOF
-
-/* Define the default plugins path to compile */
-#undef DEFAULT_PLUGINDIR
-
-/* Define if `dev_t' is a scalar */
-#undef DEV_T_IS_SCALAR
-
-/* Define to dummy `main' function (if any) required to link to the Fortran
- libraries. */
-#undef FC_DUMMY_MAIN
-
-/* Define if F77 and FC dummy `main' functions are identical. */
-#undef FC_DUMMY_MAIN_EQ_F77
-
-/* Define to a macro mangling the given C identifier (in lower and upper
- case), which must not contain underscores, for linking with Fortran. */
-#undef FC_FUNC
-
-/* As FC_FUNC, but for C identifiers containing underscores. */
-#undef FC_FUNC_
-
-/* Define if Fortran C_LONG_DOUBLE is different from C_DOUBLE */
-#undef FORTRAN_C_LONG_DOUBLE_IS_UNIQUE
-
-/* Define if we have Fortran C_LONG_DOUBLE */
-#undef FORTRAN_HAVE_C_LONG_DOUBLE
-
-/* Define if we have Fortran intrinsic C_SIZEOF */
-#undef FORTRAN_HAVE_C_SIZEOF
-
-/* Define if we have Fortran intrinsic SIZEOF */
-#undef FORTRAN_HAVE_SIZEOF
-
-/* Define if we have Fortran intrinsic STORAGE_SIZE */
-#undef FORTRAN_HAVE_STORAGE_SIZE
-
-/* Determine the size of C long double */
-#undef FORTRAN_SIZEOF_LONG_DOUBLE
-
-/* Define Fortran compiler ID */
-#undef Fortran_COMPILER_ID
-
-/* Define valid Fortran INTEGER KINDs */
-#undef H5CONFIG_F_IKIND
-
-/* Define number of valid Fortran INTEGER KINDs */
-#undef H5CONFIG_F_NUM_IKIND
-
-/* Define number of valid Fortran REAL KINDs */
-#undef H5CONFIG_F_NUM_RKIND
-
-/* Define valid Fortran REAL KINDs */
-#undef H5CONFIG_F_RKIND
-
-/* Define valid Fortran REAL KINDs Sizeof */
-#undef H5CONFIG_F_RKIND_SIZEOF
-
-/* Define to 1 if you have the `alarm' function. */
-#undef HAVE_ALARM
-
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
-/* Define if the __attribute__(()) extension is present */
-#undef HAVE_ATTRIBUTE
-
-/* Define if the compiler understands C99 designated initialization of structs
- and unions */
-#undef HAVE_C99_DESIGNATED_INITIALIZER
-
-/* Define if the compiler understands the __func__ keyword */
-#undef HAVE_C99_FUNC
-
-/* Define to 1 if you have the `clock_gettime' function. */
-#undef HAVE_CLOCK_GETTIME
-
-/* Define if the function stack tracing code is to be compiled in */
-#undef HAVE_CODESTACK
-
-/* Define if Darwin or Mac OS X */
-#undef HAVE_DARWIN
-
-/* Define to 1 if you have the `difftime' function. */
-#undef HAVE_DIFFTIME
-
-/* Define if the direct I/O virtual file driver (VFD) should be compiled */
-#undef HAVE_DIRECT
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <dmalloc.h> header file. */
-#undef HAVE_DMALLOC_H
-
-/* Define if library information should be embedded in the executables */
-#undef HAVE_EMBEDDED_LIBINFO
-
-/* Define to 1 if you have the <features.h> header file. */
-#undef HAVE_FEATURES_H
-
-/* Define if support for deflate (zlib) filter is enabled */
-#undef HAVE_FILTER_DEFLATE
-
-/* Define if support for szip filter is enabled */
-#undef HAVE_FILTER_SZIP
-
-/* Determine if __float128 is available */
-#undef HAVE_FLOAT128
-
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
-/* Define to 1 if you have the `frexpf' function. */
-#undef HAVE_FREXPF
-
-/* Define to 1 if you have the `frexpl' function. */
-#undef HAVE_FREXPL
-
-/* Define to 1 if you have the `fseeko' function. */
-#undef HAVE_FSEEKO
-
-/* Define to 1 if you have the `fseeko64' function. */
-#undef HAVE_FSEEKO64
-
-/* Define to 1 if you have the `fstat64' function. */
-#undef HAVE_FSTAT64
-
-/* Define to 1 if you have the `ftello' function. */
-#undef HAVE_FTELLO
-
-/* Define to 1 if you have the `ftello64' function. */
-#undef HAVE_FTELLO64
-
-/* Define to 1 if you have the `ftruncate64' function. */
-#undef HAVE_FTRUNCATE64
-
-/* Define if the compiler understands the __FUNCTION__ keyword */
-#undef HAVE_FUNCTION
-
-/* Determine if INTEGER*16 is available */
-#undef HAVE_Fortran_INTEGER_SIZEOF_16
-
-/* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */
-#undef HAVE_GETCONSOLESCREENBUFFERINFO
-
-/* Define to 1 if you have the `gethostname' function. */
-#undef HAVE_GETHOSTNAME
-
-/* Define to 1 if you have the `getpwuid' function. */
-#undef HAVE_GETPWUID
-
-/* Define to 1 if you have the `getrusage' function. */
-#undef HAVE_GETRUSAGE
-
-/* Define to 1 if you have the `gettextinfo' function. */
-#undef HAVE_GETTEXTINFO
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define if the compiler understands inline */
-#undef HAVE_INLINE
-
-/* Define if library will contain instrumentation to detect correct
- optimization operation */
-#undef HAVE_INSTRUMENTED_LIBRARY
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `ioctl' function. */
-#undef HAVE_IOCTL
-
-/* Define to 1 if you have the <io.h> header file. */
-#undef HAVE_IO_H
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
-/* Define to 1 if you have the `dmalloc' library (-ldmalloc). */
-#undef HAVE_LIBDMALLOC
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if you have the `mpe' library (-lmpe). */
-#undef HAVE_LIBMPE
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#undef HAVE_LIBPTHREAD
-
-/* Define to 1 if you have the `sz' library (-lsz). */
-#undef HAVE_LIBSZ
-
-/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
-#undef HAVE_LIBWS2_32
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the `longjmp' function. */
-#undef HAVE_LONGJMP
-
-/* Define to 1 if you have the `lseek64' function. */
-#undef HAVE_LSEEK64
-
-/* Define to 1 if you have the `lstat' function. */
-#undef HAVE_LSTAT
-
-/* Define to 1 if you have the <mach/mach_time.h> header file. */
-#undef HAVE_MACH_MACH_TIME_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if we have MPE support */
-#undef HAVE_MPE
-
-/* Define to 1 if you have the <mpe.h> header file. */
-#undef HAVE_MPE_H
-
-/* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */
-#undef HAVE_MPI_MULTI_LANG_Comm
-
-/* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */
-#undef HAVE_MPI_MULTI_LANG_Info
-
-/* Define if we have parallel support */
-#undef HAVE_PARALLEL
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#undef HAVE_PTHREAD_H
-
-/* Define to 1 if you have the <quadmath.h> header file. */
-#undef HAVE_QUADMATH_H
-
-/* Define to 1 if you have the `random' function. */
-#undef HAVE_RANDOM
-
-/* Define to 1 if you have the `rand_r' function. */
-#undef HAVE_RAND_R
-
-/* Define to 1 if you have the `setjmp' function. */
-#undef HAVE_SETJMP
-
-/* Define to 1 if you have the <setjmp.h> header file. */
-#undef HAVE_SETJMP_H
-
-/* Define to 1 if you have the `setsysinfo' function. */
-#undef HAVE_SETSYSINFO
-
-/* Define to 1 if you have the `siglongjmp' function. */
-#undef HAVE_SIGLONGJMP
-
-/* Define to 1 if you have the `signal' function. */
-#undef HAVE_SIGNAL
-
-/* Define to 1 if you have the `sigprocmask' function. */
-#undef HAVE_SIGPROCMASK
-
-/* Define to 1 if you have the `sigsetjmp' function. */
-#undef HAVE_SIGSETJMP
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the `srandom' function. */
-#undef HAVE_SRANDOM
-
-/* Define to 1 if you have the `stat64' function. */
-#undef HAVE_STAT64
-
-/* Define if `struct stat' has the `st_blocks' field */
-#undef HAVE_STAT_ST_BLOCKS
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define if `struct text_info' is defined */
-#undef HAVE_STRUCT_TEXT_INFO
-
-/* Define if `struct videoconfig' is defined */
-#undef HAVE_STRUCT_VIDEOCONFIG
-
-/* Define to 1 if you have the `symlink' function. */
-#undef HAVE_SYMLINK
-
-/* Define to 1 if you have the `system' function. */
-#undef HAVE_SYSTEM
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#undef HAVE_SYS_TIMEB_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <szlib.h> header file. */
-#undef HAVE_SZLIB_H
-
-/* Define if we have thread safe support */
-#undef HAVE_THREADSAFE
-
-/* Define if `timezone' is a global variable */
-#undef HAVE_TIMEZONE
-
-/* Define if the ioctl TIOCGETD is defined */
-#undef HAVE_TIOCGETD
-
-/* Define if the ioctl TIOGWINSZ is defined */
-#undef HAVE_TIOCGWINSZ
-
-/* Define to 1 if you have the `tmpfile' function. */
-#undef HAVE_TMPFILE
-
-/* Define if `tm_gmtoff' is a member of `struct tm' */
-#undef HAVE_TM_GMTOFF
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vasprintf' function. */
-#undef HAVE_VASPRINTF
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
-/* Define to 1 if you have the `waitpid' function. */
-#undef HAVE_WAITPID
-
-/* Define if your system has window style path name. */
-#undef HAVE_WINDOW_PATH
-
-/* Define to 1 if you have the <winsock2.h> header file. */
-#undef HAVE_WINSOCK2_H
-
-/* Define to 1 if you have the <zlib.h> header file. */
-#undef HAVE_ZLIB_H
-
-/* Define to 1 if you have the `_getvideoconfig' function. */
-#undef HAVE__GETVIDEOCONFIG
-
-/* Define to 1 if you have the `_scrsize' function. */
-#undef HAVE__SCRSIZE
-
-/* Define if the compiler understands __inline */
-#undef HAVE___INLINE
-
-/* Define if the compiler understands __inline__ */
-#undef HAVE___INLINE__
-
-/* Define if HDF5's high-level library headers should be included in hdf5.h */
-#undef INCLUDE_HL
-
-/* Define if your system can convert long double to (unsigned) long long
- values correctly. */
-#undef LDOUBLE_TO_LLONG_ACCURATE
-
-/* Define if your system converts long double to (unsigned) long values with
- special algorithm. */
-#undef LDOUBLE_TO_LONG_SPECIAL
-
-/* Define if your system can convert (unsigned) long long to long double
- values correctly. */
-#undef LLONG_TO_LDOUBLE_CORRECT
-
-/* Define if your system can convert (unsigned) long to long double values
- with special algorithm. */
-#undef LONG_TO_LDOUBLE_SPECIAL
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
-/* Define if the metadata trace file code is to be compiled in */
-#undef METADATA_TRACE_FILE
-
-/* Define if we can violate pointer alignment restrictions */
-#undef NO_ALIGNMENT_RESTRICTIONS
-
-/* Define if deprecated public API symbols are disabled */
-#undef NO_DEPRECATED_SYMBOLS
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Determine the maximum decimal precision in C */
-#undef PAC_C_MAX_REAL_PRECISION
-
-/* Define Fortran Maximum Real Decimal Precision */
-#undef PAC_FC_MAX_REAL_PRECISION
-
-/* Width for printf() for type `long long' or `__int64', use `ll' */
-#undef PRINTF_LL_WIDTH
-
-/* The size of `char', as computed by sizeof. */
-#undef SIZEOF_CHAR
-
-/* The size of `double', as computed by sizeof. */
-#undef SIZEOF_DOUBLE
-
-/* The size of `float', as computed by sizeof. */
-#undef SIZEOF_FLOAT
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `int16_t', as computed by sizeof. */
-#undef SIZEOF_INT16_T
-
-/* The size of `int32_t', as computed by sizeof. */
-#undef SIZEOF_INT32_T
-
-/* The size of `int64_t', as computed by sizeof. */
-#undef SIZEOF_INT64_T
-
-/* The size of `int8_t', as computed by sizeof. */
-#undef SIZEOF_INT8_T
-
-/* The size of `int_fast16_t', as computed by sizeof. */
-#undef SIZEOF_INT_FAST16_T
-
-/* The size of `int_fast32_t', as computed by sizeof. */
-#undef SIZEOF_INT_FAST32_T
-
-/* The size of `int_fast64_t', as computed by sizeof. */
-#undef SIZEOF_INT_FAST64_T
-
-/* The size of `int_fast8_t', as computed by sizeof. */
-#undef SIZEOF_INT_FAST8_T
-
-/* The size of `int_least16_t', as computed by sizeof. */
-#undef SIZEOF_INT_LEAST16_T
-
-/* The size of `int_least32_t', as computed by sizeof. */
-#undef SIZEOF_INT_LEAST32_T
-
-/* The size of `int_least64_t', as computed by sizeof. */
-#undef SIZEOF_INT_LEAST64_T
-
-/* The size of `int_least8_t', as computed by sizeof. */
-#undef SIZEOF_INT_LEAST8_T
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `long double', as computed by sizeof. */
-#undef SIZEOF_LONG_DOUBLE
-
-/* The size of `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
-
-/* The size of `off64_t', as computed by sizeof. */
-#undef SIZEOF_OFF64_T
-
-/* The size of `off_t', as computed by sizeof. */
-#undef SIZEOF_OFF_T
-
-/* The size of `ptrdiff_t', as computed by sizeof. */
-#undef SIZEOF_PTRDIFF_T
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of `ssize_t', as computed by sizeof. */
-#undef SIZEOF_SSIZE_T
-
-/* The size of `uint16_t', as computed by sizeof. */
-#undef SIZEOF_UINT16_T
-
-/* The size of `uint32_t', as computed by sizeof. */
-#undef SIZEOF_UINT32_T
-
-/* The size of `uint64_t', as computed by sizeof. */
-#undef SIZEOF_UINT64_T
-
-/* The size of `uint8_t', as computed by sizeof. */
-#undef SIZEOF_UINT8_T
-
-/* The size of `uint_fast16_t', as computed by sizeof. */
-#undef SIZEOF_UINT_FAST16_T
-
-/* The size of `uint_fast32_t', as computed by sizeof. */
-#undef SIZEOF_UINT_FAST32_T
-
-/* The size of `uint_fast64_t', as computed by sizeof. */
-#undef SIZEOF_UINT_FAST64_T
-
-/* The size of `uint_fast8_t', as computed by sizeof. */
-#undef SIZEOF_UINT_FAST8_T
-
-/* The size of `uint_least16_t', as computed by sizeof. */
-#undef SIZEOF_UINT_LEAST16_T
-
-/* The size of `uint_least32_t', as computed by sizeof. */
-#undef SIZEOF_UINT_LEAST32_T
-
-/* The size of `uint_least64_t', as computed by sizeof. */
-#undef SIZEOF_UINT_LEAST64_T
-
-/* The size of `uint_least8_t', as computed by sizeof. */
-#undef SIZEOF_UINT_LEAST8_T
-
-/* The size of `unsigned', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED
-
-/* The size of `_Quad', as computed by sizeof. */
-#undef SIZEOF__QUAD
-
-/* The size of `__float128', as computed by sizeof. */
-#undef SIZEOF___FLOAT128
-
-/* The size of `__int64', as computed by sizeof. */
-#undef SIZEOF___INT64
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if strict file format checks are enabled */
-#undef STRICT_FORMAT_CHECKS
-
-/* Define if your system supports pthread_attr_setscope(&attribute,
- PTHREAD_SCOPE_SYSTEM) call. */
-#undef SYSTEM_SCOPE_THREADS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define using v1.6 public API symbols by default */
-#undef USE_16_API_DEFAULT
-
-/* Define if a memory checking tool will be used on the library, to cause
- library to be very picky about memory operations and also disable the
- internal free list manager code. */
-#undef USING_MEMCHECKER
-
-/* Version number of package */
-#undef VERSION
-
-/* Data accuracy is prefered to speed during data conversions */
-#undef WANT_DATA_ACCURACY
-
-/* Check exception handling functions during data conversions */
-#undef WANT_DCONV_EXCEPTION
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-# undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `long int' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef ptrdiff_t
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef ssize_t
diff --git a/src/H5trace.c b/src/H5trace.c
index 428d2b2..41f3418 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -15,11 +15,11 @@
/*-------------------------------------------------------------------------
*
- * Created: H5trace.c
- * Aug 21 2006
- * Quincey Koziol <koziol@hdfgroup.org>
+ * Created: H5trace.c
+ * Aug 21 2006
+ * Quincey Koziol <koziol@hdfgroup.org>
*
- * Purpose: Internal code for tracing API calls
+ * Purpose: Internal code for tracing API calls
*
*-------------------------------------------------------------------------
*/
@@ -29,16 +29,15 @@
/****************/
#define H5I_FRIEND /*suppress error about including H5Ipkg */
-
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5Dprivate.h" /* Datasets */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5FDprivate.h" /* File drivers */
-#include "H5Ipkg.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
+#include "H5private.h" /* Generic Functions */
+#include "H5Dprivate.h" /* Datasets */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5FDprivate.h" /* File drivers */
+#include "H5Ipkg.h" /* IDs */
+#include "H5MMprivate.h" /* Memory management */
#ifdef H5_HAVE_PARALLEL
/* datatypes of predefined drivers needed by H5_trace() */
@@ -83,36 +82,36 @@
/*-------------------------------------------------------------------------
- * Function: H5_trace
+ * Function: H5_trace
*
- * Purpose: This function is called whenever an API function is called
- * and tracing is turned on. If RETURNING is non-zero then
- * the caller is about to return and RETURNING points to the
+ * Purpose: This function is called whenever an API function is called
+ * and tracing is turned on. If RETURNING is non-zero then
+ * the caller is about to return and RETURNING points to the
* time for the corresponding function call event. Otherwise
* we print the function name and the arguments.
*
- * The TYPE argument is a string which gives the type of each of
- * the following argument pairs. Each type is zero or more
- * asterisks (one for each level of indirection, although some
- * types have one level of indirection already implied) followed
- * by either one letter (lower case) or two letters (first one
- * uppercase).
+ * The TYPE argument is a string which gives the type of each of
+ * the following argument pairs. Each type is zero or more
+ * asterisks (one for each level of indirection, although some
+ * types have one level of indirection already implied) followed
+ * by either one letter (lower case) or two letters (first one
+ * uppercase).
*
- * The variable argument list consists of pairs of values. Each
- * pair is a string which is the formal argument name in the
- * calling function, followed by the argument value. The type
- * of the argument value is given by the TYPE string.
+ * The variable argument list consists of pairs of values. Each
+ * pair is a string which is the formal argument name in the
+ * calling function, followed by the argument value. The type
+ * of the argument value is given by the TYPE string.
*
- * Note: The TYPE string is meant to be terse and is generated by a
- * separate perl script.
+ * Note: The TYPE string is meant to be terse and is generated by a
+ * separate perl script.
*
- * WARNING: DO NOT CALL ANY HDF5 FUNCTION THAT CALLS FUNC_ENTER(). DOING
- * SO MAY CAUSE H5_trace() TO BE INVOKED RECURSIVELY OR MAY
- * CAUSE LIBRARY INITIALIZATIONS THAT ARE NOT DESIRED.
+ * WARNING: DO NOT CALL ANY HDF5 FUNCTION THAT CALLS FUNC_ENTER(). DOING
+ * SO MAY CAUSE H5_trace() TO BE INVOKED RECURSIVELY OR MAY
+ * CAUSE LIBRARY INITIALIZATIONS THAT ARE NOT DESIRED.
*
- * Return: Execution time for an API call
+ * Return: Execution time for an API call
*
- * Programmer: Robb Matzke
+ * Programmer: Robb Matzke
* Tuesday, June 16, 1998
*
*-------------------------------------------------------------------------
@@ -120,14 +119,14 @@
double
H5_trace(const double *returning, const char *func, const char *type, ...)
{
- va_list ap;
- char buf[64], *rest;
- const char *argname;
- int argno = 0, ptr, asize_idx;
- hssize_t asize[16];
- hssize_t i;
- void *vp = NULL;
- FILE *out = H5_debug_g.trace;
+ va_list ap;
+ char buf[64], *rest;
+ const char *argname;
+ int argno = 0, ptr, asize_idx;
+ hssize_t asize[16];
+ hssize_t i;
+ void *vp = NULL;
+ FILE *out = H5_debug_g.trace;
H5_timer_t event_time;
static H5_timer_t first_time = {0.0F, 0.0F, 0.0F};
static int current_depth = 0;
@@ -206,48 +205,48 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
/* Parse the argument types */
for(argno = 0; *type; argno++, type += (HDisupper(*type) ? 2 : 1)) {
- /* Count levels of indirection */
- for(ptr = 0; '*' == *type; type++)
+ /* Count levels of indirection */
+ for(ptr = 0; '*' == *type; type++)
ptr++;
- if('[' == *type) {
- if('a' == type[1]) {
- asize_idx = (int)HDstrtol(type + 2, &rest, 10);
+ if('[' == *type) {
+ if('a' == type[1]) {
+ asize_idx = (int)HDstrtol(type + 2, &rest, 10);
HDassert(0 <= asize_idx && asize_idx < (int) NELMTS(asize));
- HDassert(']'==*rest);
- type = rest + 1;
- } else {
- rest = (char *)HDstrchr(type, ']');
- HDassert(rest);
- type = rest + 1;
- asize_idx = -1;
- }
- } /* end if */
+ HDassert(']'==*rest);
+ type = rest + 1;
+ } else {
+ rest = (char *)HDstrchr(type, ']');
+ HDassert(rest);
+ type = rest + 1;
+ asize_idx = -1;
+ }
+ } /* end if */
else
- asize_idx = -1;
-
- /*
- * The argument name. Leave off the `_id' part. If the argument
- * name is the null pointer then don't print the argument or the
- * following `='. This is used for return values.
- */
- argname = va_arg(ap, char *); /*lint !e64 Type mismatch not really occuring */
- if(argname) {
- unsigned n = (unsigned)MAX (0, (int)HDstrlen(argname) - 3); /*lint !e666 Allow expression with side effects */
-
- if(!HDstrcmp(argname + n, "_id")) {
- HDstrncpy(buf, argname, (size_t)MIN((int)sizeof(buf) - 1, n));
- buf[MIN((int)sizeof(buf) - 1, n)] = '\0';
- argname = buf;
- } /* end if */
- fprintf(out, "%s%s=", argno?", ":"", argname);
- } /* end if */
+ asize_idx = -1;
+
+ /*
+ * The argument name. Leave off the `_id' part. If the argument
+ * name is the null pointer then don't print the argument or the
+ * following `='. This is used for return values.
+ */
+ argname = va_arg(ap, char *); /*lint !e64 Type mismatch not really occuring */
+ if(argname) {
+ unsigned n = (unsigned)MAX (0, (int)HDstrlen(argname) - 3); /*lint !e666 Allow expression with side effects */
+
+ if(!HDstrcmp(argname + n, "_id")) {
+ HDstrncpy(buf, argname, (size_t)MIN((int)sizeof(buf) - 1, n));
+ buf[MIN((int)sizeof(buf) - 1, n)] = '\0';
+ argname = buf;
+ } /* end if */
+ fprintf(out, "%s%s=", argno?", ":"", argname);
+ } /* end if */
else
- argname = "";
+ argname = "";
- /* The value */
- if(ptr)
+ /* The value */
+ if(ptr)
vp = va_arg(ap, void *); /*lint !e64 Type mismatch not really occuring */
- switch(type[0]) {
+ switch(type[0]) {
case 'a':
if(ptr) {
if(vp)
@@ -268,7 +267,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
fprintf(out, "0x%lx", (unsigned long)vp);
else
fprintf(out, "NULL");
- } /* end if */
+ } /* end if */
else {
hbool_t bool_var = va_arg(ap, hbool_t); /*lint !e732 Loss of sign not really occuring */
@@ -2554,7 +2553,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
else
fprintf(out, "BADTYPE(%c)", type[0]);
goto error;
- } /* end switch */
+ } /* end switch */
} /* end for */
/* Display event time for return */
@@ -2565,10 +2564,10 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
error:
va_end(ap);
if(returning)
- fprintf(out, ";\n");
+ fprintf(out, ";\n");
else {
- last_call_depth = current_depth++;
- fprintf (out, ")");
+ last_call_depth = current_depth++;
+ fprintf (out, ")");
} /* end else */
HDfflush(out);
diff --git a/src/Makefile.in b/src/Makefile.in
index 7cf8ec3..3955eeb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -102,9 +102,8 @@ DIST_COMMON = $(top_srcdir)/config/commence.am \
$(top_srcdir)/config/lt_vers.am \
$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(srcdir)/H5config.h.in \
- $(top_srcdir)/bin/mkinstalldirs $(srcdir)/libhdf5.settings.in \
- $(top_srcdir)/bin/depcomp $(include_HEADERS) \
- $(top_srcdir)/bin/test-driver COPYING
+ $(srcdir)/libhdf5.settings.in $(top_srcdir)/bin/depcomp \
+ $(include_HEADERS) $(top_srcdir)/bin/test-driver COPYING
noinst_PROGRAMS = H5detect$(EXEEXT) H5make_libsettings$(EXEEXT)
TESTS =
subdir = src
@@ -113,7 +112,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = H5config.h $(top_builddir)/fortran/src/H5config_f.inc
CONFIG_CLEAN_FILES = libhdf5.settings
CONFIG_CLEAN_VPATH_FILES =
@@ -200,7 +199,7 @@ am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \
H5Topaque.lo H5Torder.lo H5Tpad.lo H5Tprecis.lo H5Tstrpad.lo \
H5Tvisit.lo H5Tvlen.lo H5TS.lo H5VM.lo H5WB.lo H5Z.lo \
H5Zdeflate.lo H5Zfletcher32.lo H5Znbit.lo H5Zshuffle.lo \
- H5Zszip.lo H5Zscaleoffset.lo H5Ztrans.lo
+ H5Zscaleoffset.lo H5Zszip.lo H5Ztrans.lo
libhdf5_la_OBJECTS = $(am_libhdf5_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -468,7 +467,6 @@ AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -824,8 +822,8 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
H5Topaque.c \
H5Torder.c \
H5Tpad.c H5Tprecis.c H5Tstrpad.c H5Tvisit.c H5Tvlen.c H5TS.c H5VM.c H5WB.c H5Z.c \
- H5Zdeflate.c H5Zfletcher32.c H5Znbit.c H5Zshuffle.c H5Zszip.c \
- H5Zscaleoffset.c H5Ztrans.c
+ H5Zdeflate.c H5Zfletcher32.c H5Znbit.c H5Zshuffle.c \
+ H5Zscaleoffset.c H5Zszip.c H5Ztrans.c
# Public headers