mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-25 17:00:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r1802] Changes since 19991019

Browse Source 
----------------------

./MANIFEST
./configure.in
./configure			[REGENERATED]
	Added more checking for `make' features.

./Makefile.in
./doc/Makefile.in
./doc/html/Makefile.in
./doc/html/Tutor/Makefile.in
./examples/Makefile.in
./pablo/Makefile.in
./src/Makefile.in
./test/Makefile.in
./testpar/Makefile.in
./tools/Makefile.in
./config/commence.in
./config/conclude.in
./config/depend.in		[REMOVED]
./config/depend1.in		[NEW]
./config/depend2.in		[NEW]
./config/depend3.in		[NEW]
./config/depend4.in		[NEW]
./config/dependN.in		[NEW]
	The directory search stuff was moved into commence.in, thereby
	shortening the Makefile.in prologues.

./doc/html/Dependencies		[NEW]
./doc/html/Tutor/Dependencies	[NEW]
./examples/Dependencies		[NEW]
./src/Dependencies		[NEW]
./test/Dependencies		[NEW]
./testpar/Dependencies		[NEW]
./tools/Dependencies		[NEW]
	The `.distdep' files were all renamed to `Dependencies' to make them
	more obvious. They are required (but may be empty) in every directory
	that has a Makefile.in that ends with @CONCLUDE@ (you'll get an
	obvious error from make if you forgot to create one).

./bin/trace
./src/H5.c
	Added H5E_major_t and H5E_minor_t although tracing only prints the
	integer value.

./src/H5E.c
./src/H5Epublic.h
	Added tracing information.

./src/H5FDcore.c
./src/H5FDfamily.c
./src/H5FDgass.c
./src/H5FDmpio.c
./src/H5FDsec2.c
./src/H5FDstdio.c
	Fixed places where FUNC_LEAVE() evaluated it's argument more than
	once.

	Added tracing information.

	Wrapped long lines.

./config/gnu-flags
	Fixed a syntax error when we don't have a gnu compiler.
This commit is contained in:
Robb Matzke 1999-11-01 10:21:16 -05:00
parent 7dec251c1a
commit eb8747499d
41 changed files with 12451 additions and 787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10676
Changes Normal file
View File

File diff suppressed because it is too large Load Diff

1
INSTALL
View File

@ -228,6 +228,7 @@
One may also use various environment variables to change the
behavior of the compiler. E.g., to ask for -n32 ABI:
$ SGI_ABI=-n32
$ export SGI_ABI
$ ./configure

6
MANIFEST
View File

@ -46,7 +46,11 @@
./config/conclude.in
./config/dec-flags
./config/dec-osf4.x
./config/depend.in
./config/depend1.in
./config/depend2.in
./config/depend3.in
./config/depend4.in
./config/dependN.in
./config/freebsd
./config/gnu-flags
./config/hpux10.20

2
Makefile.in
View File

@ -11,8 +11,6 @@
top_srcdir=@top_srcdir@
top_builddir=.
srcdir=@srcdir@
VPATH=.:@srcdir@
.PATH: . @srcdir@
@COMMENCE@
# Subdirectories in build-order (not including `examples')

6
bin/iostats
View File

@ -78,6 +78,8 @@ if (!$fast) {
print "="x36, "\n";
printf("Write: %8d calls, %10d total bytes, %10g average bytes\n",
$total_writes, $total_bytes_out, $total_bytes_out/$total_writes);
$total_writes, $total_bytes_out, $total_bytes_out/$total_writes)
if $total_writes;
printf("Read: %8d calls, %10d total bytes, %10g average bytes\n",
$total_reads, $total_bytes_in, $total_bytes_in/$total_reads);
$total_reads, $total_bytes_in, $total_bytes_in/$total_reads)
if $total_reads;

2
bin/trace
View File

@ -23,6 +23,8 @@ $Source = "";
"herr_t" => "e",
"H5E_direction_t" => "Ed",
"H5E_error_t*" => "Ee",
"H5E_major_t" => "Ej",
"H5E_minor_t" => "En",
"H5F_scope_t" => "Fs",
"H5FD_t*" => "x",
"H5FD_class_t*" => "x",

15
config/commence.in
View File

@ -9,6 +9,9 @@
.SUFFIXES: .c .o .lo
@SET_MAKE@
## Directories to serch
@SEARCH@
## Programs
SHELL=/bin/sh
CC=@CC@
@ -105,10 +108,14 @@ all:
STAMP1=$(top_builddir)/config/stamp1
STAMP2=$(top_builddir)/config/stamp2
MAKEFILE_PARTS=$(srcdir)/Makefile.in \
$(top_srcdir)/config/commence.in \
$(top_srcdir)/config/conclude.in \
$(top_srcdir)/config/depend.in
MAKEFILE_PARTS=$(srcdir)/Makefile.in \
$(top_srcdir)/config/commence.in \
$(top_srcdir)/config/conclude.in \
$(top_srcdir)/config/depend1.in \
$(top_srcdir)/config/depend2.in \
$(top_srcdir)/config/depend3.in \
$(top_srcdir)/config/depend4.in \
$(top_srcdir)/config/dependN.in
$(STAMP1): $(top_srcdir)/configure.in
touch $(STAMP1)

14
config/conclude.in
View File

@ -170,15 +170,9 @@ maintainer-clean: distclean
##-----------------------------------------------------------------------------
## The following section of this makefile contains dependencies between the
## source files and the header files. If GNU make and GCC are being used then
## the dependencies are in the form of rules that cause the information to
## be kept updated automatically. Otherwise the dependencies are listed
## explicitly and come from the `.distdep' files in the various directories.
## These files are part of the distribution and are generated automatically on
## GNU/GCC systems.
## source files and the header files.
##-----------------------------------------------------------------------------
.PHONY: dep depend
dep depend: $(srcdir)/Dependencies
@DEPEND1@
@DEPEND2@
@DEPEND3@
@DEPEND4@
@DEPEND@

20
config/depend.in → config/depend1.in
View File

@ -20,13 +20,14 @@
## otherwise the file is changed and a backup is saved by appending a
## tilde to the file name.
##
.PRECIOUS: .depend .distdep
dep depend: .distdep
.distdep: .depend
touch .distdep
-srcdir=$(srcdir) perl -p $(top_srcdir)/bin/distdep .depend >.distdep
.PRECIOUS: $(srcdir)/Dependencies
$(srcdir)/Dependencies: .depend
-@echo '## This file is machine generated on GNU systems.' >$@
-@echo '## Only temporary changes may be made here.' >>@
-@echo >>@
-srcdir=$(srcdir) perl -p $(top_srcdir)/bin/distdep .depend >>$@
.PRECIOUS: .depend
.depend: $(LIB_SRC) $(TEST_SRC) $(PROG_SRC)
@touch .depend
@for dep in $? dummy; do \
@ -39,7 +40,12 @@ dep depend: .distdep
sed 's/\.o/.lo/' >>$@; \
fi; \
done;
-perl -p $(top_srcdir)/bin/distdep .depend >$(srcdir)/.distdep
-@echo '## This file is machine generated on GNU systems.' \
>$(srcdir)/Dependencies
-@echo '## Only temporary changes may be made here.' \
>>$(srcdir)/Dependencies
-@echo >>$(srcdir)/Dependencies
-perl -p $(top_srcdir)/bin/distdep .depend >>$(srcdir)/Dependencies
-include .depend

11
config/depend2.in Normal file
View File

@ -0,0 +1,11 @@
## -*- makefile -*-
## This platform doesn't support automatic dependencies because we're
## not using GNU gcc. GNU gcc is needed in order to generate the list
## of header files included by a source file.
## Since automatic dependencies are not being used, we attempt to include the
## `.distdep' file from the source tree. This file was automatically generated
## on some system that satisfies the above requirements.
-include $(srcdir)/Dependencies

7
config/depend3.in Normal file
View File

@ -0,0 +1,7 @@
## -*- makefile -*-
## Since automatic dependencies are not being used, we attempt to include the
## `.distdep' file from the source tree. This file was automatically generated
## on some system that satisfies the above requirements.
.include <$(srcdir)/Dependencies>

7
config/depend4.in Normal file
View File

@ -0,0 +1,7 @@
## -*- makefile -*-
## Since automatic dependencies are not being used, we attempt to include the
## `.distdep' file from the source tree. This file was automatically generated
## on some system that satisfies the above requirements.
include $(srcdir)/Dependencies

4
config/dependN.in Normal file
View File

@ -0,0 +1,4 @@
## -*- makefile -*-
## Automatic dependencies are not being used and we cannot include other
## files.

2
config/gnu-flags
View File

@ -27,6 +27,8 @@ if test X = "X$cc_flags_set"; then
cc_vers_major=`echo $cc_version | cut -f1 -d.`
cc_vers_minor=`echo $cc_version | cut -f2 -d.`
cc_vers_patch=`echo $cc_version | cut -f3 -d.`
test -n "$cc_vers_major" || cc_vers_major=0
test -n "$cc_vers_minor" || cc_vers_minor=0
test -n "$cc_vers_patch" || cc_vers_patch=0
cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch`
fi

1138
configure vendored
View File

File diff suppressed because it is too large Load Diff

142
configure.in
View File

@ -112,15 +112,127 @@ if test "X$AR" = "X"; then
fi
AC_SUBST(AR)
AC_MSG_CHECKING(for GNU Make)
AC_MSG_CHECKING(make)
AC_SUBST_FILE(DEPEND)
if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\
sed -n 1p|cut -c1-8`" = "GNU Make"; then
AC_MSG_RESULT(yes)
GMAKE=yes
AC_MSG_RESULT(GNU make)
GMAKE=yes
if test "X$GCC" = "Xyes"; then
DEPEND=config/depend1
else
DEPEND=config/depend2
fi
else
AC_MSG_RESULT(no)
AC_MSG_RESULT(generic)
fi
dnl How do we include another file into a Makefile?
if test "X" = "X$DEPEND"; then
AC_MSG_CHECKING(how to include a makefile)
dnl The include file contains the target for `foo'
cat >makeinc <<EOF
foo:
@:
EOF
while true; do #for break
dnl pmake. We have to be careful because some pmake think that the
dnl contents of the MAKE environment variable is a target.
echo '.include <makeinc>' >maketest
if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
AC_MSG_RESULT([.include <FILE>])
DEPEND=config/depend3
break
fi
dnl Most make's use `include FILE'
echo 'include makeinc' >maketest
if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
AC_MSG_RESULT(include FILE)
DEPEND=config/depend4
break;
fi
dnl default
AC_MSG_RESULT(you have a deficient make command)
DEPEND=config/dependN
break
done
rm makeinc maketest
fi
dnl Sometimes makes think the `.PATH:' appearing before the first rule
dnl with an action should override the `all' default target. So we have
dnl to decide what the proper syntax is.
dnl
AC_MSG_CHECKING(how make searches directories)
while true; do #for break
# The most common method is `VPATH=DIR1 DIR2 ...'
cat >maketest <<EOF
VPATH=$srcdir/config $srcdir/src $srcdir/bin
.c.o:
cp $< H5.o
foo: H5.o
rm H5.o
@echo works
EOF
if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
SEARCH_RULE='VPATH='
SEARCH_SEP=' '
AC_MSG_RESULT([VPATH=DIR1 DIR2 ...])
break
fi
# The second most common method is like above except with the
# directories separated by colons.
cat >maketest <<EOF
VPATH=$srcdir/config:$srcdir/src:$srcdir/bin
.c.o:
cp $< H5.o
foo: H5.o
rm H5.o
@echo works
EOF
if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
SEARCH_RULE='VPATH='
SEARCH_SEP=':'
AC_MSG_RESULT([VPATH=DIR1:DIR2:...])
break
fi
# pmake uses the construct `.PATH: DIR1 DIR2
cat >maketest <<EOF
.PATH: $srcdir/config $srcdir/src $srcdir/bin
.c.o:
cp $< H5.o
foo: H5.o
rm H5.o
@echo works
EOF
if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
SEARCH_RULE='.PATH: '
SEARCH_SEP=' '
AC_MSG_RESULT([.PATH: DIR1 DIR2 ...])
break
fi
# No way for make to search directories
SEARCH_RULE='## SEARCH DISABLED: '
SEARCH_SEP=' '
AC_MSG_RESULT([it doesn't])
if test ! -f configure; then
AC_MSG_ERROR(${MAKE-make} requires the build and source directories to be the same)
fi
break
done
rm maketest
dnl ----------------------------------------------------------------------
dnl Turn on warning flags for gcc.
dnl
@ -878,17 +990,10 @@ dnl
AC_SUBST_FILE(COMMENCE) COMMENCE=config/commence
AC_SUBST_FILE(CONCLUDE) CONCLUDE=config/conclude
if test "X$GCC" = "Xyes" && test "X$GMAKE" = "Xyes"; then
AC_SUBST_FILE(DEPEND1) DEPEND1=config/depend
AC_SUBST_FILE(DEPEND2) DEPEND2=/dev/null
AC_SUBST_FILE(DEPEND3) DEPEND3=/dev/null
AC_SUBST_FILE(DEPEND4) DEPEND4=/dev/null
else
AC_SUBST_FILE(DEPEND1) DEPEND1=$srcdir/src/.distdep
AC_SUBST_FILE(DEPEND2) DEPEND2=$srcdir/test/.distdep
AC_SUBST_FILE(DEPEND3) DEPEND3=$srcdir/testpar/.distdep
AC_SUBST_FILE(DEPEND4) DEPEND4=$srcdirtools/.distdep
fi
dnl The directory search list
AC_SUBST(SEARCH) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src'
cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"'
SEARCH="$SEARCH_RULE`eval $cmd`"
dnl We don't need to say when we're entering directories if we're using
dnl GNU make becuase make does it for us.
@ -924,9 +1029,10 @@ touch ./config/stamp1
# Then the config.status file (but not makefiles)
saved_no_create=$no_create
no_create=yes
AC_OUTPUT(src/libhdf5.settings config/depend config/commence config/conclude \
Makefile src/Makefile pablo/Makefile test/Makefile \
testpar/Makefile tools/Makefile examples/Makefile \
AC_OUTPUT(src/libhdf5.settings config/depend1 config/depend2 config/depend3
config/depend4 config/dependN config/commence config/conclude
Makefile src/Makefile pablo/Makefile test/Makefile
testpar/Makefile tools/Makefile examples/Makefile
doc/Makefile doc/html/Makefile doc/html/Tutor/Makefile)
no_create=$saved_no_create

1
doc/Makefile.in
View File

@ -11,7 +11,6 @@
top_srcdir=@top_srcdir@
top_builddir=..
srcdir=@srcdir@
VPATH=.:@srcdir@
@COMMENCE@
# Subdirectories in build-order

3
doc/html/Dependencies Normal file
View File

@ -0,0 +1,3 @@
## This file is machine generated on GNU systems.
## Only temporary changes may be made here.

37
doc/html/Makefile.in
View File

@ -7,41 +7,30 @@
top_srcdir=@top_srcdir@
top_builddir=../..
srcdir=@srcdir@
VPATH=.:@srcdir@
@COMMENCE@
# Subdirectories in build-order (not including `examples')
SUBDIRS=Tutor
DOCDIR=$(docdir)/hdf5
TRACE=perl $(top_srcdir)/bin/trace
# Add `-I.' to the C preprocessor flags.
CPPFLAGS=-I. -I@srcdir@ @CPPFLAGS@
# Temporary files
MOSTLYCLEAN=
# Public doc files (to be installed)...
PUB_DOCS=Attributes.html Big.html Caching.html Chunking.html Chunk_f1.gif \
Chunk_f2.gif Chunk_f3.gif Chunk_f4.gif Chunk_f5.gif Chunk_f6.gif \
Coding.html Copyright.html Datasets.html Dataspaces.html \
Datatypes.html ddl.html Debugging.html EnumMap.gif Environment.html \
Errors.html Files.html \
Filters.html Glossary.html \
Groups.html H5.api_map.html H5.format.html H5.intro.html \
H5.sample_code.html H5.user.html H5.user.PrintGen.html \
H5.user.PrintTpg.html IH_map1.gif IH_map2.gif IH_map3.gif IH_map4.gif \
IH_mapFoot.gif IH_mapHead.gif IOPipe.html \
NCSAfooterlogo.gif \
Properties.html Ragged.html References.html RM_H5.html \
RM_H5A.html RM_H5D.html RM_H5E.html RM_H5F.html RM_H5Front.html \
RM_H5G.html RM_H5I.html RM_H5P.html RM_H5R.html RM_H5RA.html \
RM_H5S.html RM_H5T.html RM_H5Z.html Tools.html Version.html chunk1.gif \
compat.html dataset_p1.gif dataset_p1.obj extern1.gif extern2.gif \
group_p1.gif group_p2.gif group_p3.gif h5s.examples hdf2.jpg \
ph5design.html ph5example.c ph5implement.txt pipe1.gif pipe2.gif \
pipe3.gif pipe4.gif pipe5.gif index.html version.gif
Errors.html Files.html Filters.html Glossary.html Groups.html \
H5.api_map.html H5.format.html H5.intro.html H5.sample_code.html \
H5.user.html H5.user.PrintGen.html H5.user.PrintTpg.html IH_map1.gif \
IH_map2.gif IH_map3.gif IH_map4.gif IH_mapFoot.gif IH_mapHead.gif \
IOPipe.html NCSAfooterlogo.gif Properties.html Ragged.html \
References.html RM_H5.html RM_H5A.html RM_H5D.html RM_H5E.html \
RM_H5F.html RM_H5Front.html RM_H5G.html RM_H5I.html RM_H5P.html \
RM_H5R.html RM_H5RA.html RM_H5S.html RM_H5T.html RM_H5Z.html \
Tools.html Version.html chunk1.gif compat.html dataset_p1.gif \
dataset_p1.obj extern1.gif extern2.gif group_p1.gif group_p2.gif \
group_p3.gif h5s.examples hdf2.jpg ph5design.html ph5example.c \
ph5implement.txt pipe1.gif pipe2.gif pipe3.gif pipe4.gif pipe5.gif \
index.html version.gif
# Other doc files (not to be installed)...
PRIVATE_DOCS=Chunk_f1.obj Chunk_f2.obj Chunk_f6.obj CodeReview.html \

1
doc/html/Tutor/Dependencies Normal file
View File

@ -0,0 +1 @@
## There are no dependencies in this directory

9
doc/html/Tutor/Makefile.in
View File

@ -7,21 +7,12 @@
top_srcdir=@top_srcdir@
top_builddir=../../..
srcdir=@srcdir@
VPATH=.:@srcdir@
@COMMENCE@
# Subdirectories in build-order (not including `examples')
SUBDIRS=
DOCDIR=$(docdir)/hdf5/Tutor
TRACE=perl $(top_srcdir)/bin/trace
# Add `-I.' to the C preprocessor flags.
CPPFLAGS=-I. -I@srcdir@ @CPPFLAGS@
# Temporary files
MOSTLYCLEAN=
# Public doc files (to be installed)...
PUB_DOCS=

313
examples/Dependencies Normal file
View File

@ -0,0 +1,313 @@
## This file is machine generated on GNU systems.
## Only temporary changes may be made here.
h5_chunk_read.lo: \
h5_chunk_read.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5_compound.lo: \
h5_compound.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5_extend_write.lo: \
h5_extend_write.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5_group.lo: \
h5_group.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5_read.lo: \
h5_read.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5_write.lo: \
h5_write.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5_select.lo: \
h5_select.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5_attribute.lo: \
h5_attribute.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5_mount.lo: \
h5_mount.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5_reference.lo: \
h5_reference.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h

2
examples/Makefile.in
View File

@ -6,8 +6,6 @@
top_srcdir=@top_srcdir@
top_builddir=..
srcdir=@srcdir@
VPATH=.:@srcdir@
.PATH: . @srcdir@
@COMMENCE@
## Add include directory to the C preprocessor flags and the hdf5 library

2
pablo/Makefile.in
View File

@ -7,8 +7,6 @@
top_srcdir=@top_srcdir@
top_builddir=..
srcdir=@srcdir@
VPATH=.:@srcdir@
.PATH: . @srcdir@
@COMMENCE@
TRACE=perl ../bin/trace
###############################################################################

193
src/.distdep → src/Dependencies
View File

@ -1,3 +1,6 @@
## This file is machine generated on GNU systems.
## Only temporary changes may be made here.
H5.lo: \
H5.c \
H5private.h \
@ -30,7 +33,11 @@ H5.lo: \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Rprivate.h \
H5Zprivate.h
H5A.lo: \
H5A.c \
H5private.h \
@ -64,7 +71,10 @@ H5A.lo: \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
H5Pprivate.h
H5Pprivate.h \
H5Ppublic.h \
H5Apkg.h \
H5Aprivate.h
H5AC.lo: \
H5AC.c \
H5private.h \
@ -77,7 +87,9 @@ H5AC.lo: \
H5Fpublic.h \
H5Ipublic.h \
H5FDpublic.h \
H5MMpublic.h
H5MMpublic.h \
H5Eprivate.h \
H5Epublic.h
H5B.lo: \
H5B.c \
H5private.h \
@ -139,7 +151,9 @@ H5D.lo: \
H5HLpublic.h \
H5MMprivate.h \
H5Pprivate.h \
H5Ppublic.h
H5Ppublic.h \
H5TBprivate.h \
H5Vprivate.h
H5E.lo: \
H5E.c \
H5private.h \
@ -148,7 +162,9 @@ H5E.lo: \
H5api_adpt.h \
H5Iprivate.h \
H5Ipublic.h \
H5Eprivate.h
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h
H5F.lo: \
H5F.c \
H5FDcore.h \
@ -191,7 +207,10 @@ H5F.lo: \
H5ACprivate.h \
H5ACpublic.h \
H5Eprivate.h \
H5Epublic.h
H5Epublic.h \
H5FDprivate.h \
H5MMprivate.h \
H5Pprivate.h
H5Farray.lo: \
H5Farray.c \
H5private.h \
@ -225,7 +244,8 @@ H5Farray.lo: \
H5Epublic.h \
H5Iprivate.h \
H5MFprivate.h \
H5Pprivate.h
H5Pprivate.h \
H5Ppublic.h
H5Fistore.lo: \
H5Fistore.c \
H5private.h \
@ -259,7 +279,10 @@ H5Fistore.lo: \
H5Epublic.h \
H5Iprivate.h \
H5MFprivate.h \
H5MMprivate.h
H5MMprivate.h \
H5Pprivate.h \
H5Ppublic.h \
H5Vprivate.h
H5FD.lo: \
H5FD.c \
H5private.h \
@ -292,7 +315,10 @@ H5FDsec2.lo: \
H5Fpublic.h \
H5FDpublic.h \
H5MMpublic.h \
H5FDsec2.h
H5FDsec2.h \
H5MMprivate.h \
H5Pprivate.h \
H5Ppublic.h
H5FDfamily.lo: \
H5FDfamily.c \
H5private.h \
@ -306,7 +332,10 @@ H5FDfamily.lo: \
H5Fpublic.h \
H5FDpublic.h \
H5MMpublic.h \
H5FDfamily.h
H5FDfamily.h \
H5MMprivate.h \
H5Pprivate.h \
H5Ppublic.h
H5FDmpio.lo: \
H5FDmpio.c \
H5private.h \
@ -320,7 +349,10 @@ H5FDmpio.lo: \
H5Fpublic.h \
H5FDpublic.h \
H5MMpublic.h \
H5FDmpio.h
H5FDmpio.h \
H5MMprivate.h \
H5Pprivate.h \
H5Ppublic.h
H5FDcore.lo: \
H5FDcore.c \
H5private.h \
@ -334,7 +366,10 @@ H5FDcore.lo: \
H5Fpublic.h \
H5FDpublic.h \
H5MMpublic.h \
H5FDcore.h
H5FDcore.h \
H5MMprivate.h \
H5Pprivate.h \
H5Ppublic.h
H5FDmulti.lo: \
H5FDmulti.c \
hdf5.h \
@ -380,7 +415,10 @@ H5FDgass.lo: \
H5Fpublic.h \
H5FDpublic.h \
H5MMpublic.h \
H5FDgass.h
H5FDgass.h \
H5MMprivate.h \
H5Pprivate.h \
H5Ppublic.h
H5FDstdio.lo: \
H5FDstdio.c \
hdf5.h \
@ -451,7 +489,9 @@ H5G.lo: \
H5ACpublic.h \
H5HLprivate.h \
H5HLpublic.h \
H5Iprivate.h
H5Iprivate.h \
H5MMprivate.h \
H5RAprivate.h
H5Gent.lo: \
H5Gent.c \
H5private.h \
@ -470,7 +510,9 @@ H5Gent.lo: \
H5MMpublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h
H5Bprivate.h \
H5Bpublic.h \
H5HLprivate.h
H5Gnode.lo: \
H5Gnode.c \
H5private.h \
@ -508,7 +550,8 @@ H5Gnode.lo: \
H5Dpublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Pprivate.h
H5Pprivate.h \
H5Ppublic.h
H5Gstab.lo: \
H5Gstab.c \
H5private.h \
@ -541,7 +584,9 @@ H5Gstab.lo: \
H5Rprivate.h \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h
H5Spublic.h \
H5Dpublic.h \
H5Zprivate.h
H5HG.lo: \
H5HG.c \
H5private.h \
@ -559,7 +604,10 @@ H5HG.lo: \
H5Epublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5MFprivate.h
H5MFprivate.h \
H5MMprivate.h \
H5Pprivate.h \
H5Ppublic.h
H5HL.lo: \
H5HL.c \
H5private.h \
@ -591,7 +639,9 @@ H5I.lo: \
H5api_adpt.h \
H5Iprivate.h \
H5Ipublic.h \
H5Eprivate.h
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h
H5MF.lo: \
H5MF.c \
H5private.h \
@ -604,8 +654,7 @@ H5MF.lo: \
H5Fprivate.h \
H5Fpublic.h \
H5FDpublic.h \
H5MMpublic.h \
H5FDprivate.h
H5MMpublic.h
H5MM.lo: \
H5MM.c \
H5private.h \
@ -647,7 +696,11 @@ H5O.lo: \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Dpublic.h
H5Dpublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Pprivate.h \
H5Ppublic.h
H5Oattr.lo: \
H5Oattr.c \
H5private.h \
@ -676,7 +729,11 @@ H5Oattr.lo: \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Dpublic.h
H5Dpublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Apkg.h \
H5Aprivate.h
H5Ocomp.lo: \
H5Ocomp.c \
H5private.h \
@ -763,7 +820,9 @@ H5Odtype.lo: \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Dpublic.h
H5Dpublic.h \
H5Zprivate.h \
H5Zpublic.h
H5Oefl.lo: \
H5Oefl.c \
H5private.h \
@ -792,7 +851,9 @@ H5Oefl.lo: \
H5Tpublic.h \
H5Rprivate.h \
H5Rpublic.h \
H5Sprivate.h
H5Sprivate.h \
H5Spublic.h \
H5Dpublic.h
H5Ofill.lo: \
H5Ofill.c \
H5private.h \
@ -821,7 +882,11 @@ H5Ofill.lo: \
H5Rprivate.h \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h
H5Spublic.h \
H5Dpublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Pprivate.h
H5Olayout.lo: \
H5Olayout.c \
H5private.h \
@ -850,7 +915,9 @@ H5Olayout.lo: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h \
H5Zpublic.h
H5Zpublic.h \
H5Eprivate.h \
H5Epublic.h
H5Omtime.lo: \
H5Omtime.c \
H5private.h \
@ -932,7 +999,10 @@ H5Onull.lo: \
H5Tpublic.h \
H5Rprivate.h \
H5Rpublic.h \
H5Sprivate.h
H5Sprivate.h \
H5Spublic.h \
H5Dpublic.h \
H5Zprivate.h
H5Osdspace.lo: \
H5Osdspace.c \
H5private.h \
@ -1053,7 +1123,8 @@ H5P.lo: \
H5Eprivate.h \
H5Epublic.h \
H5FDprivate.h \
H5MMprivate.h
H5MMprivate.h \
H5Pprivate.h
H5R.lo: \
H5R.c \
H5private.h \
@ -1082,7 +1153,9 @@ H5R.lo: \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h
H5Zprivate.h \
H5Zpublic.h \
H5Eprivate.h
H5RA.lo: \
H5RA.c \
H5RAprivate.h \
@ -1116,7 +1189,9 @@ H5RA.lo: \
H5Zpublic.h \
H5Eprivate.h \
H5Epublic.h \
H5Iprivate.h
H5Iprivate.h \
H5MMprivate.h \
H5Pprivate.h
H5S.lo: \
H5S.c \
H5private.h \
@ -1145,7 +1220,9 @@ H5S.lo: \
H5Rprivate.h \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h
H5Spublic.h \
H5Dpublic.h \
H5Zprivate.h
H5Sall.lo: \
H5Sall.c \
H5private.h \
@ -1174,7 +1251,9 @@ H5Sall.lo: \
H5Tprivate.h \
H5Tpublic.h \
H5Rprivate.h \
H5Rpublic.h
H5Rpublic.h \
H5Zprivate.h \
H5Zpublic.h
H5Shyper.lo: \
H5Shyper.c \
H5private.h \
@ -1208,7 +1287,8 @@ H5Shyper.lo: \
H5Epublic.h \
H5Iprivate.h \
H5MMprivate.h \
H5Pprivate.h
H5Pprivate.h \
H5Ppublic.h
H5Smpio.lo: \
H5Smpio.c \
H5private.h \
@ -1237,7 +1317,9 @@ H5Smpio.lo: \
H5Tprivate.h \
H5Tpublic.h \
H5Rprivate.h \
H5Rpublic.h
H5Rpublic.h \
H5Zprivate.h \
H5Zpublic.h
H5Snone.lo: \
H5Snone.c \
H5private.h \
@ -1266,7 +1348,9 @@ H5Snone.lo: \
H5Tprivate.h \
H5Tpublic.h \
H5Rprivate.h \
H5Rpublic.h
H5Rpublic.h \
H5Zprivate.h \
H5Zpublic.h
H5Spoint.lo: \
H5Spoint.c \
H5private.h \
@ -1295,7 +1379,11 @@ H5Spoint.lo: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Rprivate.h
H5Rprivate.h \
H5Rpublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Vprivate.h
H5Sselect.lo: \
H5Sselect.c \
H5private.h \
@ -1324,7 +1412,11 @@ H5Sselect.lo: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Rprivate.h
H5Rprivate.h \
H5Rpublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Vprivate.h
H5T.lo: \
H5T.c \
H5private.h \
@ -1358,7 +1450,8 @@ H5T.lo: \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
H5Pprivate.h
H5Pprivate.h \
H5Ppublic.h
H5Tbit.lo: \
H5Tbit.c \
H5private.h \
@ -1381,8 +1474,7 @@ H5Tbit.lo: \
H5Tprivate.h \
H5Tpublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h
H5Gpublic.h
H5Tconv.lo: \
H5Tconv.c \
H5Iprivate.h \
@ -1408,7 +1500,10 @@ H5Tconv.lo: \
H5Rprivate.h \
H5Rpublic.h \
H5Tprivate.h \
H5Tpublic.h
H5Tpublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h
H5Tinit.lo: \
H5Tinit.c \
H5private.h \
@ -1432,7 +1527,8 @@ H5Tinit.lo: \
H5Tprivate.h \
H5Tpublic.h \
H5Gprivate.h \
H5Gpublic.h
H5Gpublic.h \
H5Bprivate.h
H5Tvlen.lo: \
H5Tvlen.c \
H5private.h \
@ -1456,7 +1552,8 @@ H5Tvlen.lo: \
H5Tprivate.h \
H5Tpublic.h \
H5Gprivate.h \
H5Gpublic.h
H5Gpublic.h \
H5Bprivate.h
H5TB.lo: \
H5TB.c \
H5private.h \
@ -1465,7 +1562,9 @@ H5TB.lo: \
H5api_adpt.h \
H5Iprivate.h \
H5Ipublic.h \
H5Eprivate.h
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h
H5V.lo: \
H5V.c \
H5private.h \
@ -1537,4 +1636,6 @@ H5Zdeflate.lo: \
H5MMpublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Fprivate.h
H5Fprivate.h \
H5Fpublic.h \
H5FDpublic.h

29
src/H5.c
View File

@ -1139,6 +1139,9 @@ H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds)
* Added the `a' type letter for haddr_t arguments and `Mt' for
* H5FD_mem_t arguments.
*
* Robb Matzke, 1999-10-25
* The `Ej' and `En' types are H5E_major_t and H5E_minor_t error
* types. We only print the integer value here.
*-------------------------------------------------------------------------
*/
void
@ -1360,6 +1363,32 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
fprintf (out, "0x%lx", (unsigned long)error);
}
break;
case 'j':
if (ptr) {
if (vp) {
fprintf(out, "0x%lx", (unsigned long)vp);
} else {
fprintf(out, "NULL");
}
} else {
H5E_major_t n = va_arg(ap, H5E_major_t);
fprintf(out, "%d", (int)n);
}
break;
case 'n':
if (ptr) {
if (vp) {
fprintf(out, "0x%lx", (unsigned long)vp);
} else {
fprintf(out, "NULL");
}
} else {
H5E_minor_t n = va_arg(ap, H5E_minor_t);
fprintf(out, "%d", (int)n);
}
break;
default:
fprintf (out, "BADTYPE(E%c)", type[1]);

16
src/H5E.c
View File

@ -539,19 +539,23 @@ H5E_push(H5E_major_t maj_num, H5E_minor_t min_num, const char *function_name,
* Programmer: Quincey Koziol
* Monday, October 18, 1999
*
* Notes: Basically a public API wrapper around the H5E_push function.
* Notes: Basically a public API wrapper around the H5E_push function.
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
__DLL__ herr_t H5Epush(const char *file, const char *func,
unsigned line, H5E_major_t maj, H5E_minor_t min, const char *str)
herr_t
H5Epush(const char *file, const char *func, unsigned line, H5E_major_t maj,
H5E_minor_t min, const char *str)
{
herr_t ret_value;
FUNC_ENTER(H5Epush, FAIL);
FUNC_LEAVE(H5E_push(maj,min,func,file,line,str));
} /* end H5Epush() */
H5TRACE6("e","ssIuEjEns",file,func,line,maj,min,str);
ret_value = H5E_push(maj, min, func, file, line, str);
FUNC_LEAVE(ret_value);
}
/*-------------------------------------------------------------------------

40
src/H5FDcore.c
View File

@ -175,8 +175,8 @@ H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store)
H5FD_core_fapl_t fa;
FUNC_ENTER(H5FD_set_fapl_core, FAIL);
H5TRACE3("e","izb",fapl_id,increment,backing_store);
/* NO TRACE */
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a fapl");
fa.increment = increment;
@ -212,8 +212,8 @@ H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/,
H5FD_core_fapl_t *fa;
FUNC_ENTER(H5Pget_fapl_core, FAIL);
H5TRACE3("e","ixx",fapl_id,increment,backing_store);
/* NO TRACE */
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a fapl");
if (H5FD_CORE!=H5Pget_driver(fapl_id))
@ -253,7 +253,8 @@ H5FD_core_fapl_get(H5FD_t *_file)
FUNC_ENTER(H5FD_core_fapl_get, NULL);
if (NULL==(fa=H5MM_calloc(sizeof(H5FD_core_fapl_t))))
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
"memory allocation failed");
fa->increment = file->increment;
fa->backing_store = (file->fd>=0);
@ -301,12 +302,14 @@ H5FD_core_open(const char *name, unsigned UNUSED flags, hid_t fapl_id,
/* Open backing store */
if (fa && fa->backing_store && name &&
(fd=open(name, O_CREAT|O_TRUNC|O_RDWR, 0666))<0) {
HRETURN_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open backing store");
HRETURN_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL,
"unable to open backing store");
}
/* Create the new file struct */
if (NULL==(file=H5MM_calloc(sizeof(H5FD_core_t))))
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate file struct");
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
"unable to allocate file struct");
file->fd = fd;
if (name && *name) {
file->name = HDstrdup(name);
@ -354,13 +357,15 @@ H5FD_core_flush(H5FD_t *_file)
unsigned char *ptr = file->mem;
if (0!=lseek(file->fd, 0, SEEK_SET))
HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "error seeking in backing store");
HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL,
"error seeking in backing store");
while (size) {
ssize_t n = write(file->fd, ptr, size);
if (n<0 && EINTR==errno) continue;
if (n<0)
HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "error writing backing store");
HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
"error writing backing store");
ptr += (size_t)n;
size -= (size_t)n;
}
@ -398,7 +403,7 @@ H5FD_core_close(H5FD_t *_file)
/* Flush */
if (H5FD_core_flush(_file)<0)
HRETURN_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "can't flush file");
HRETURN_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file");
/* Release resources */
if (file->fd>=0) close(file->fd);
@ -434,23 +439,21 @@ H5FD_core_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
{
const H5FD_core_t *f1 = (const H5FD_core_t*)_f1;
const H5FD_core_t *f2 = (const H5FD_core_t*)_f2;
int ret_value;
FUNC_ENTER(H5FD_core_cmp, FAIL);
if (NULL==f1->name && NULL==f2->name) {
if (f1<f2)
HRETURN(-1);
if (f1>f2)
HRETURN(1);
if (f1<f2) HRETURN(-1);
if (f1>f2) HRETURN(1);
HRETURN(0);
}
if (NULL==f1->name)
HRETURN(-1);
if (NULL==f2->name)
HRETURN(1);
if (NULL==f1->name) HRETURN(-1);
if (NULL==f2->name) HRETURN(1);
FUNC_LEAVE(HDstrcmp(f1->name, f2->name));
ret_value = HDstrcmp(f1->name, f2->name);
FUNC_LEAVE(ret_value);
}
@ -652,7 +655,8 @@ H5FD_core_write(H5FD_t *_file, hid_t UNUSED dxpl_id, haddr_t addr,
if (NULL==file->mem) x = H5MM_malloc(new_eof);
else x = H5MM_realloc(file->mem, new_eof);
if (!x)
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate memory block");
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
"unable to allocate memory block");
file->mem = x;
file->eof = new_eof;
}

40
src/H5FDfamily.c
View File

@ -169,8 +169,8 @@ H5Pset_fapl_family(hid_t fapl_id, hsize_t memb_size, hid_t memb_fapl_id)
herr_t ret_value=FAIL;
H5FD_family_fapl_t fa;
/*NO TRACE*/
FUNC_ENTER(H5FD_set_fapl_family, FAIL);
H5TRACE3("e","ihi",fapl_id,memb_size,memb_fapl_id);
/* Check arguments */
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
@ -215,8 +215,8 @@ H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size/*out*/,
{
H5FD_family_fapl_t *fa;
/*NO TRACE*/
FUNC_ENTER(H5Pget_fapl_family, FAIL);
H5TRACE3("e","ixx",fapl_id,memb_size,memb_fapl_id);
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a fapl");
@ -257,7 +257,8 @@ H5FD_family_fapl_get(H5FD_t *_file)
FUNC_ENTER(H5FD_family_fapl_get, NULL);
if (NULL==(fa=H5MM_calloc(sizeof(H5FD_family_fapl_t))))
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
"memory allocation failed");
fa->memb_size = file->memb_size;
fa->memb_fapl_id = H5Pcopy(file->memb_fapl_id);
@ -291,7 +292,8 @@ H5FD_family_fapl_copy(const void *_old_fa)
FUNC_ENTER(H5FD_family_fapl_copy, NULL);
if (NULL==(new_fa=H5MM_malloc(sizeof(H5FD_family_fapl_t))))
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
"memory allocation failed");
memcpy(new_fa, old_fa, sizeof(H5FD_family_fapl_t));
new_fa->memb_fapl_id = H5Pcopy(old_fa->memb_fapl_id);
@ -355,7 +357,8 @@ H5FD_family_dxpl_copy(const void *_old_dx)
FUNC_ENTER(H5FD_family_dxpl_copy, NULL);
if (NULL==(new_dx=H5MM_malloc(sizeof(H5FD_family_dxpl_t))))
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
"memory allocation failed");
memcpy(new_dx, old_dx, sizeof(H5FD_family_dxpl_t));
new_dx->memb_dxpl_id = H5Pcopy(old_dx->memb_dxpl_id);
@ -432,7 +435,8 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
/* Initialize file from file access properties */
if (NULL==(file=H5MM_calloc(sizeof(H5FD_family_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate file struct");
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
"unable to allocate file struct");
if (H5P_DEFAULT==fapl_id) {
file->memb_fapl_id = H5P_DEFAULT;
file->memb_size = 1024*1024*1024; /*1GB*/
@ -460,7 +464,8 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
int n = MAX(64, 2*file->amembs);
H5FD_t **x = H5MM_realloc(file->memb, n*sizeof(H5FD_t*));
if (!x)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't reallocate members");
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
"unable to reallocate members");
file->amembs = n;
file->memb = x;
}
@ -478,7 +483,8 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
} H5E_END_TRY;
if (!file->memb[file->nmembs]) {
if (0==file->nmembs)
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open member file");
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL,
"unable to open member file");
H5Eclear();
break;
}
@ -550,7 +556,8 @@ H5FD_family_close(H5FD_t *_file)
}
}
if (nerrors)
HRETURN_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close member files");
HRETURN_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL,
"unable to close member files");
/* Clean up other stuff */
H5Pclose(file->memb_fapl_id);
@ -662,7 +669,8 @@ H5FD_family_set_eoa(H5FD_t *_file, haddr_t eoa)
int n = MAX(64, 2*file->amembs);
H5FD_t **x = H5MM_realloc(file->memb, n*sizeof(H5FD_t*));
if (!x)
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate memory block");
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
"unable to allocate memory block");
file->amembs = n;
file->memb = x;
file->nmembs = i;
@ -677,7 +685,8 @@ H5FD_family_set_eoa(H5FD_t *_file, haddr_t eoa)
file->memb_fapl_id, file->memb_size);
} H5E_END_TRY;
if (NULL==file->memb[i])
HRETURN_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "can't open member file");
HRETURN_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL,
"unable to open member file");
}
/* Set the EOA marker for the member */
@ -797,7 +806,8 @@ H5FD_family_read(H5FD_t *_file, hid_t dxpl_id, haddr_t addr, hsize_t size,
assert(i<file->nmembs);
if (H5FDread(file->memb[i], memb_dxpl_id, sub, req, buf)<0)
HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL, "member file read failed");
HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
"member file read failed");
addr += req;
buf += req;
@ -859,7 +869,8 @@ H5FD_family_write(H5FD_t *_file, hid_t dxpl_id, haddr_t addr, hsize_t size,
assert(i<file->nmembs);
if (H5FDwrite(file->memb[i], memb_dxpl_id, sub, req, buf)<0)
HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "member file write failed");
HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
"member file write failed");
addr += req;
buf += req;
@ -899,7 +910,8 @@ H5FD_family_flush(H5FD_t *_file)
nerrors++;
if (nerrors)
HRETURN_ERROR(H5E_IO, H5E_BADVALUE, FAIL, "can't flush member files");
HRETURN_ERROR(H5E_IO, H5E_BADVALUE, FAIL,
"unable to flush member files");
FUNC_LEAVE(SUCCEED);
}

3
src/H5FDgass.c
View File

@ -210,7 +210,6 @@ H5Pset_fapl_gass(hid_t fapl_id, GASS_Info info)
herr_t ret_value=FAIL;
H5FD_gass_fapl_t fa;
/*NO TRACE*/
FUNC_ENTER(H5FD_set_fapl_gass, FAIL);
/* Check arguments */
@ -256,8 +255,8 @@ H5Pget_fapl_gass(hid_t fapl_id, GASS_Info *info/*out*/)
{
H5FD_gass_fapl_t *fa;
/*NO TRACE*/
FUNC_ENTER(H5Pget_fapl_gass, FAIL);
H5TRACE2("e","ix",fapl_id,info);
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a fapl");

8
src/H5FDmpio.c
View File

@ -235,8 +235,8 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
herr_t ret_value=FAIL;
H5FD_mpio_fapl_t fa;
/*NO TRACE*/
FUNC_ENTER(H5FD_set_fapl_mpio, FAIL);
H5TRACE3("e","iMcMi",fapl_id,comm,info);
/* Check arguments */
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
@ -288,8 +288,8 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
{
H5FD_mpio_fapl_t *fa;
/*NO TRACE*/
FUNC_ENTER(H5Pget_fapl_mpio, FAIL);
H5TRACE3("e","ixx",fapl_id,comm,info);
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a fapl");
@ -337,8 +337,8 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
herr_t ret_value=FAIL;
H5FD_mpio_dxpl_t dx;
/*NO TRACE*/
FUNC_ENTER(H5Pset_dxpl_mpio, FAIL);
H5TRACE2("e","iDt",dxpl_id,xfer_mode);
/* Check arguments */
if (H5P_DATA_XFER!=H5Pget_class(dxpl_id))
@ -381,8 +381,8 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/)
{
H5FD_mpio_dxpl_t *dx;
/*NO TRACE*/
FUNC_ENTER(H5Pget_dxpl_mpio, FAIL);
H5TRACE2("e","ix",dxpl_id,xfer_mode);
if (H5P_DATA_XFER!=H5Pget_class(dxpl_id))
HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl");

30
src/H5FDsec2.c
View File

@ -213,8 +213,8 @@ H5Pset_fapl_sec2(hid_t fapl_id)
{
herr_t ret_value=FAIL;
/*NO TRACE*/
FUNC_ENTER(H5FD_set_fapl_sec2, FAIL);
H5TRACE1("e","i",fapl_id);
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a fapl");
@ -275,24 +275,25 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t UNUSED fapl_id,
/* Open the file */
if ((fd=HDopen(name, o_flags, 0666))<0)
HRETURN_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file");
HRETURN_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file");
if (fstat(fd, &sb)<0) {
close(fd);
HRETURN_ERROR(H5E_FILE, H5E_BADFILE, NULL, "can't fstat file");
HRETURN_ERROR(H5E_FILE, H5E_BADFILE, NULL, "unable to fstat file");
}
/* Create the new file struct */
if (NULL==(file=H5MM_calloc(sizeof(H5FD_sec2_t))))
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate file struct");
HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
"unable to allocate file struct");
file->fd = fd;
file->eof = sb.st_size;
file->pos = HADDR_UNDEF;
file->op = OP_UNKNOWN;
#ifdef WIN32
filehandle = _get_osfhandle(fd);
results = GetFileInformationByHandle(filehandle, &fileinfo);
file->fileindexhi = fileinfo.nFileIndexHigh;
file->fileindexlo = fileinfo.nFileIndexLow;
filehandle = _get_osfhandle(fd);
results = GetFileInformationByHandle(filehandle, &fileinfo);
file->fileindexhi = fileinfo.nFileIndexHigh;
file->fileindexlo = fileinfo.nFileIndexLow;
#else
file->device = sb.st_dev;
file->inode = sb.st_ino;
@ -325,9 +326,9 @@ H5FD_sec2_close(H5FD_t *_file)
FUNC_ENTER(H5FD_sec2_close, FAIL);
if (H5FD_sec2_flush(_file)<0)
HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "can't flush file");
HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to flush file");
if (close(file->fd)<0)
HRETURN_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "can't close file");
HRETURN_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "unable to close file");
H5MM_xfree(file);
@ -516,7 +517,8 @@ H5FD_sec2_read(H5FD_t *_file, hid_t UNUSED dxpl_id, haddr_t addr,
file_seek(file->fd, (file_offset_t)addr, SEEK_SET)<0) {
file->pos = HADDR_UNDEF;
file->op = OP_UNKNOWN;
HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "can't seek to proper position");
HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL,
"unable to seek to proper position");
}
/*
@ -595,7 +597,8 @@ H5FD_sec2_write(H5FD_t *_file, hid_t UNUSED dxpl_id, haddr_t addr,
file_seek(file->fd, (file_offset_t)addr, SEEK_SET)<0) {
file->pos = HADDR_UNDEF;
file->op = OP_UNKNOWN;
HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "can't seek to proper position");
HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL,
"unable to seek to proper position");
}
/*
@ -655,7 +658,8 @@ H5FD_sec2_flush(H5FD_t *_file)
if (file->eoa>file->eof) {
if (-1==file_seek(file->fd, file->eoa-1, SEEK_SET))
HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "can't seek to proper position");
HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL,
"unable to seek to proper position");
if (write(file->fd, "", 1)!=1)
HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed");
file->eof = file->eoa;

16
src/H5FDstdio.c
View File

@ -10,7 +10,7 @@
* Notes: Ported to the new H5FD architecture on 10/18/99 - QAK
*
*/
#include "hdf5.h"
#include <hdf5.h>
#include <assert.h>
#include <stdlib.h>
#include <sys/stat.h>
@ -198,15 +198,19 @@ H5FD_stdio_init(void)
herr_t
H5Pset_fapl_stdio(hid_t fapl_id)
{
static const char *func="H5FDset_fapl_stdio"; /* Function Name for error reporting */
static const char *func="H5FDset_fapl_stdio"; /*for error reporting*/
/*NO TRACE*/
/* Clear the error stack */
H5Eclear();
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
H5Epush_ret(func, H5E_PLIST, H5E_BADTYPE, "not a file access property list", -1);
return(H5Pset_driver(fapl_id, H5FD_STDIO, NULL));
if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id)) {
H5Epush_ret(func, H5E_PLIST, H5E_BADTYPE,
"not a file access property list", -1);
}
return H5Pset_driver(fapl_id, H5FD_STDIO, NULL);
}

12
src/Makefile.in
View File

@ -7,8 +7,6 @@
top_srcdir=@top_srcdir@
top_builddir=..
srcdir=@srcdir@
VPATH=.:@srcdir@
.PATH: . @srcdir@
@COMMENCE@
TRACE=perl $(top_srcdir)/bin/trace
@ -24,11 +22,11 @@ CLEAN=libhdf5.settings
LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fistore.c \
H5FD.c H5FDsec2.c H5FDfamily.c H5FDmpio.c H5FDcore.c H5FDmulti.c \
H5FDgass.c H5FDstdio.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c \
H5I.c H5MF.c H5MM.c H5O.c H5Oattr.c H5Ocomp.c H5Ocont.c H5Odtype.c H5Oefl.c \
H5Ofill.c H5Olayout.c H5Omtime.c H5Oname.c H5Onull.c H5Osdspace.c \
H5Oshared.c H5Ostab.c H5P.c H5R.c H5RA.c H5S.c H5Sall.c H5Shyper.c \
H5Smpio.c H5Snone.c H5Spoint.c H5Sselect.c H5T.c H5Tbit.c H5Tconv.c \
H5Tinit.c H5Tvlen.c H5TB.c H5V.c H5Z.c H5Zdeflate.c
H5I.c H5MF.c H5MM.c H5O.c H5Oattr.c H5Ocomp.c H5Ocont.c H5Odtype.c \
H5Oefl.c H5Ofill.c H5Olayout.c H5Omtime.c H5Oname.c H5Onull.c \
H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c H5R.c H5RA.c H5S.c H5Sall.c \
H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c H5Sselect.c H5T.c H5Tbit.c \
H5Tconv.c H5Tinit.c H5Tvlen.c H5TB.c H5V.c H5Z.c H5Zdeflate.c
LIB_OBJ=$(LIB_SRC:.c=.lo)

41
test/.distdep → test/Dependencies
View File

@ -1,3 +1,6 @@
## This file is machine generated on GNU systems.
## Only temporary changes may be made here.
h5test.lo: \
h5test.c \
h5test.h \
@ -500,7 +503,8 @@ gheap.lo: \
H5Tprivate.h \
H5Gprivate.h \
H5Bprivate.h \
H5Eprivate.h
H5Eprivate.h \
H5Iprivate.h
hyperslab.lo: \
hyperslab.c \
H5private.h \
@ -586,8 +590,7 @@ istore.lo: \
H5Sprivate.h \
H5Zprivate.h \
H5Iprivate.h \
H5Pprivate.h \
H5MMprivate.h
H5Pprivate.h
lheap.lo: \
lheap.c \
h5test.h \
@ -628,8 +631,7 @@ lheap.lo: \
H5Rprivate.h \
H5Tprivate.h \
H5Gprivate.h \
H5Bprivate.h \
H5HLprivate.h
H5Bprivate.h
links.lo: \
links.c \
h5test.h \
@ -897,8 +899,7 @@ stab.lo: \
H5Rprivate.h \
H5Tprivate.h \
H5Gprivate.h \
H5Bprivate.h \
H5Gpkg.h
H5Bprivate.h
tattr.lo: \
tattr.c \
testhdf5.h \
@ -931,7 +932,8 @@ tattr.lo: \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h
H5FDstdio.h \
H5FDgass.h
testhdf5.lo: \
testhdf5.c \
testhdf5.h \
@ -939,8 +941,7 @@ testhdf5.lo: \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Eprivate.h \
H5Epublic.h
H5Eprivate.h
tfile.lo: \
tfile.c \
testhdf5.h \
@ -988,7 +989,9 @@ th5s.lo: \
H5Tpublic.h \
H5Rprivate.h \
H5Rpublic.h \
H5Zprivate.h
H5Zprivate.h \
H5Zpublic.h \
H5Pprivate.h
tmeta.lo: \
tmeta.c \
testhdf5.h \
@ -1033,7 +1036,8 @@ trefer.lo: \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h
H5FDstdio.h \
H5FDgass.h
tselect.lo: \
tselect.c \
testhdf5.h \
@ -1066,7 +1070,8 @@ tselect.lo: \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h
H5FDstdio.h \
H5FDgass.h
tvltypes.lo: \
tvltypes.c \
testhdf5.h \
@ -1099,7 +1104,8 @@ tvltypes.lo: \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h
H5FDstdio.h \
H5FDgass.h
tvlstr.lo: \
tvlstr.c \
testhdf5.h \
@ -1132,7 +1138,8 @@ tvlstr.lo: \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h
H5FDstdio.h \
H5FDgass.h
unlink.lo: \
unlink.c \
h5test.h \
@ -1288,7 +1295,9 @@ gass_read.lo: \
H5HGprivate.h \
H5Fprivate.h \
H5Rprivate.h \
H5Tprivate.h
H5Tprivate.h \
H5Gprivate.h \
H5Bprivate.h
gass_append.lo: \
gass_append.c \
h5test.h \

3
test/Makefile.in
View File

@ -7,8 +7,6 @@
top_srcdir=@top_srcdir@
top_builddir=..
srcdir=@srcdir@
VPATH=.:@srcdir@
.PATH: . @srcdir@
@COMMENCE@
## Add include directory to the C preprocessor flags and the h5test and hdf5
@ -167,4 +165,3 @@ gass_append: gass_append.lo
@$(LT_LINK_EXE) $(CFLAGS) -o $@ gass_append.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
@CONCLUDE@

8
testpar/Dependencies Normal file
View File

@ -0,0 +1,8 @@
testphdf5.lo: \
H5config.h
t_dset.lo: \
H5config.h
t_file.lo: \
H5config.h
t_mpi.lo: \
H5config.h

2
testpar/Makefile.in
View File

@ -7,8 +7,6 @@
top_srcdir=@top_srcdir@
top_builddir=..
srcdir=@srcdir@
VPATH=.:@srcdir@
.PATH: . @srcdir@
@COMMENCE@
## Add the include directory to the C preprocessor flags the the hdf5 library

365
tools/Dependencies Normal file
View File

@ -0,0 +1,365 @@
## This file is machine generated on GNU systems.
## Only temporary changes may be made here.
h5tools.lo: \
h5tools.c \
h5tools.h \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h \
H5FDmulti.h \
H5private.h
h5findshd.lo: \
h5findshd.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h \
H5FDmulti.h \
H5private.h
h5debug.lo: \
h5debug.c \
H5private.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Iprivate.h \
H5Ipublic.h \
H5Bprivate.h \
H5Bpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5FDpublic.h \
H5MMpublic.h \
H5Pprivate.h \
H5Ppublic.h \
H5Dpublic.h \
H5Zpublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5HLprivate.h \
H5HLpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Rprivate.h \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h
h5import.lo: \
h5import.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h \
H5FDmulti.h
h5ls.lo: \
h5ls.c \
H5private.h \
H5public.h \
H5config.h \
H5api_adpt.h \
h5tools.h \
hdf5.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h
h5repart.lo: \
h5repart.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h \
H5FDmulti.h
h5dump.lo: \
h5dump.c \
h5dump.h \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h \
H5FDmulti.h \
H5private.h
h5dumputil.lo: \
h5dumputil.c \
h5dump.h \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h \
H5FDmulti.h
h5toh4.lo: \
h5toh4.c \
h5toh4.h \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h \
H5FDmulti.h
h5dumptst.lo: \
h5dumptst.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h \
H5FDmulti.h \
H5private.h
pdb2hdf.lo: \
pdb2hdf.c \
hdf5.h \
H5public.h \
H5config.h \
H5api_adpt.h \
H5Ipublic.h \
H5Apublic.h \
H5ACpublic.h \
H5Bpublic.h \
H5Dpublic.h \
H5Epublic.h \
H5Fpublic.h \
H5FDpublic.h \
H5Gpublic.h \
H5HGpublic.h \
H5HLpublic.h \
H5MMpublic.h \
H5Opublic.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5RApublic.h \
H5Spublic.h \
H5Tpublic.h \
H5FDcore.h \
H5FDfamily.h \
H5FDmpio.h \
H5FDsec2.h \
H5FDstdio.h \
H5FDgass.h \
H5FDmulti.h

2
tools/Makefile.in
View File

@ -7,8 +7,6 @@
top_srcdir=@top_srcdir@
top_builddir=..
srcdir=@srcdir@
VPATH=.:@srcdir@
.PATH: . @srcdir@
@COMMENCE@
## Add include directory to the C preprocessor flags, add -lh5tools and

9
tools/pdb2hdf.c
View File

@ -220,7 +220,6 @@ fix_type(PDBfile *pdb, const char *s)
mpos = nbits - (d->format[5]+msize);
H5Tset_fields(type, spos, epos, esize, mpos, msize);
H5Tset_ebias(type, d->format[7]);
}
return type;
}
@ -347,6 +346,7 @@ traverse(PDBfile *pdb, const char *pdb_file_name, hid_t hdf)
fprintf(stderr, "cannot traverse out of PDB %s\n", list[i]);
goto error;
}
H5Gclose(group);
} else {
/* This is some non-directory PDB object */
@ -382,6 +382,11 @@ traverse(PDBfile *pdb, const char *pdb_file_name, hid_t hdf)
}
}
for (i=0; i<nitems; i++) {
SC_free(list[i]);
}
SC_free(list);
return 0;
error:
@ -479,7 +484,7 @@ main(int argc, char *argv[])
exit(1);
}
H5Pclose(fapl);
/*
* Traverse the PDB file to create the HDF5 file.
*/