diff options
| -rwxr-xr-x | bin/iostats | 19 | ||||
| -rw-r--r-- | config/conclude.in | 15 | ||||
| -rwxr-xr-x | configure | 505 | ||||
| -rw-r--r-- | src/H5G.c | 10 | ||||
| -rw-r--r-- | src/H5Tconv.c | 1652 | ||||
| -rw-r--r-- | src/H5Tpkg.h | 121 | ||||
| -rw-r--r-- | src/Makefile.in | 6 | ||||
| -rw-r--r-- | test/Makefile.in | 9 | ||||
| -rw-r--r-- | tools/Makefile.in | 21 |
9 files changed, 2046 insertions, 312 deletions
diff --git a/bin/iostats b/bin/iostats index 924c273..d55d550 100755 --- a/bin/iostats +++ b/bin/iostats @@ -3,8 +3,9 @@ # Usage: pipe the output of Linux's `strace' program into the stdin of # this command, and the output of this command into gnuplot. -$filename = shift || "tstab2.h5"; -$total = 0; +my $filename = shift || "tstab2.h5"; +my $total = 0; +my %What; # What{pos}{nbytes}{r|w} = naccesses while (<>) { if (!defined $fd) { @@ -22,6 +23,7 @@ while (<>) { } elsif (/^write\((\d+), ".*?"(\.\.\.)?, \d+\)\s*= (\d+)/ && $1==$fd && $3>=0) { my $nbytes = $3; + $What{$pos}{$nbytes}{w}++; printf "%d %d\n", $total, $pos; $pos += $nbytes; $total += $nbytes; @@ -30,6 +32,7 @@ while (<>) { } elsif (/^read\((\d+), ".*?"(\.\.\.)?, \d+\)\s*= (\d+)/ && $1==$fd && $3>=0) { my $nbytes = $3; + $What{$pos}{$nbytes}{r}++; printf "%d %d\n", $total, $pos; $pos += $nbytes; $total += $nbytes; @@ -37,4 +40,14 @@ while (<>) { die $_; } } - + + +print "="x36, "\n"; + printf "%8s %8s %8s %8s\n","Position","NBytes","NReads","NWrites"; +for $pos (sort {$a<=>$b} keys %What) { + for $nbytes (sort {$a<=>$b} keys %{$What{$pos}}) { + printf "%8d %8d %8d %8d\n", $pos, $nbytes, + $What{$pos}{$nbytes}{r}, + $What{$pos}{$nbytes}{w}; + } +} diff --git a/config/conclude.in b/config/conclude.in index 8eab342..a11ced7 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -20,9 +20,9 @@ TAGS: $(LIB_SRC) -etags $(LIB_SRC) # Runs each test in order, passing $(TEST_FLAGS) to the program. -tests: $(LIB) $(TESTS) +tests: $(TEST_PROGS) test _test: tests - @for test in $(TESTS) dummy; do \ + @for test in $(TEST_PROGS) dummy; do \ if test $$test != dummy; then \ echo "============================"; \ echo "Testing $$test $(TEST_FLAGS)"; \ @@ -31,6 +31,15 @@ test _test: tests echo ""; \ fi; \ done; + @for test in $(TEST_SCRIPTS) dummy; do \ + if test $$test != dummy; then \ + echo "============================"; \ + echo "Testing $$test $(TEST_FLAGS)"; \ + echo "============================"; \ + $(RUNTEST) /bin/sh ./$$test $(TEST_FLAGS) || exit 1; \ + echo ""; \ + fi; \ + done; # Install the library, the public header files, and programs. install: $(LIB) $(PUB_HDR) $(PROGS) @@ -76,7 +85,7 @@ mostlyclean: # is part of the HDF5 distribution. # clean: mostlyclean - $(RM) $(LIB) $(TESTS) $(PROGS) $(CLEAN) + $(RM) $(LIB) $(TEST_PROGS) $(PROGS) $(CLEAN) # Like `clean' except it also removes files that were created by running # configure. If you've unpacked the source and built HDF5 without creating @@ -1088,9 +1088,51 @@ EOF else echo "$ac_t""no" 1>&6 fi - + echo $ac_n "checking for main in -ljpeg""... $ac_c" 1>&6 +echo "configure:1093: checking for main in -ljpeg" >&5 +ac_lib_var=`echo jpeg'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ljpeg $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1101 "configure" +#include "confdefs.h" + +int main() { +main() +; return 0; } +EOF +if { (eval echo configure:1108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 +EOF + + LIBS="-ljpeg $LIBS" + +else + echo "$ac_t""no" 1>&6 +fi + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1094: checking how to run the C preprocessor" >&5 +echo "configure:1136: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1105,13 +1147,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1109 "configure" +#line 1151 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1122,13 +1164,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1126 "configure" +#line 1168 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1151,12 +1193,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1155: checking for ANSI C header files" >&5 +echo "configure:1197: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1160 "configure" +#line 1202 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1164,7 +1206,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1181,7 +1223,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1185 "configure" +#line 1227 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1199,7 +1241,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1203 "configure" +#line 1245 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1220,7 +1262,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1224 "configure" +#line 1266 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1231,7 +1273,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1255,12 +1297,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1259: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1301: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1264 "configure" +#line 1306 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -1269,7 +1311,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1293,17 +1335,17 @@ for ac_hdr in io.h sys/resource.h sys/time.h unistd.h winsock.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1297: checking for $ac_hdr" >&5 +echo "configure:1339: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1302 "configure" +#line 1344 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1333,17 +1375,17 @@ for ac_hdr in sys/ioctl.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1337: checking for $ac_hdr" >&5 +echo "configure:1379: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1342 "configure" +#line 1384 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1371,12 +1413,12 @@ done echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1375: checking for off_t" >&5 +echo "configure:1417: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1380 "configure" +#line 1422 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1404,12 +1446,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1408: checking for size_t" >&5 +echo "configure:1450: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1413 "configure" +#line 1455 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1437,12 +1479,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:1441: checking for ssize_t" >&5 +echo "configure:1483: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1446 "configure" +#line 1488 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1470,14 +1512,14 @@ EOF fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1474: checking whether byte ordering is bigendian" >&5 +echo "configure:1516: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 1481 "configure" +#line 1523 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1488,11 +1530,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 1496 "configure" +#line 1538 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -1503,7 +1545,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1523,7 +1565,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1527 "configure" +#line 1569 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -1536,7 +1578,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1560,7 +1602,7 @@ EOF fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:1564: checking size of short" >&5 +echo "configure:1606: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1568,7 +1610,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext <<EOF -#line 1572 "configure" +#line 1614 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1579,7 +1621,7 @@ main() exit(0); } EOF -if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -1599,7 +1641,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1603: checking size of int" >&5 +echo "configure:1645: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1607,7 +1649,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext <<EOF -#line 1611 "configure" +#line 1653 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1618,7 +1660,7 @@ main() exit(0); } EOF -if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -1638,7 +1680,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1642: checking size of long" >&5 +echo "configure:1684: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1646,7 +1688,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext <<EOF -#line 1650 "configure" +#line 1692 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1657,7 +1699,7 @@ main() exit(0); } EOF -if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1677,7 +1719,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:1681: checking size of long long" >&5 +echo "configure:1723: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1727,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext <<EOF -#line 1689 "configure" +#line 1731 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1696,7 +1738,7 @@ main() exit(0); } EOF -if { (eval echo configure:1700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -1716,7 +1758,7 @@ EOF echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:1720: checking size of __int64" >&5 +echo "configure:1762: checking size of __int64" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1724,7 +1766,7 @@ else ac_cv_sizeof___int64=8 else cat > conftest.$ac_ext <<EOF -#line 1728 "configure" +#line 1770 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1735,7 +1777,7 @@ main() exit(0); } EOF -if { (eval echo configure:1739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof___int64=`cat conftestval` else @@ -1755,7 +1797,7 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:1759: checking size of float" >&5 +echo "configure:1801: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1763,7 +1805,7 @@ else ac_cv_sizeof_float=4 else cat > conftest.$ac_ext <<EOF -#line 1767 "configure" +#line 1809 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1774,7 +1816,7 @@ main() exit(0); } EOF -if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -1794,7 +1836,7 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:1798: checking size of double" >&5 +echo "configure:1840: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1802,7 +1844,7 @@ else ac_cv_sizeof_double=8 else cat > conftest.$ac_ext <<EOF -#line 1806 "configure" +#line 1848 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1813,7 +1855,7 @@ main() exit(0); } EOF -if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -1833,7 +1875,7 @@ EOF echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:1837: checking size of long double" >&5 +echo "configure:1879: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1841,7 +1883,7 @@ else ac_cv_sizeof_long_double=8 else cat > conftest.$ac_ext <<EOF -#line 1845 "configure" +#line 1887 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1852,7 +1894,7 @@ main() exit(0); } EOF -if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_double=`cat conftestval` else @@ -1872,7 +1914,7 @@ EOF echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:1876: checking size of size_t" >&5 +echo "configure:1918: checking size of size_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1880,7 +1922,7 @@ else ac_cv_sizeof_size_t=4 else cat > conftest.$ac_ext <<EOF -#line 1884 "configure" +#line 1926 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1891,7 +1933,7 @@ main() exit(0); } EOF -if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else @@ -1914,7 +1956,7 @@ cat >>confdefs.h <<\EOF #include <sys/types.h> /*for off_t definition*/ EOF echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:1918: checking size of off_t" >&5 +echo "configure:1960: checking size of off_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1922,7 +1964,7 @@ else ac_cv_sizeof_off_t=4 else cat > conftest.$ac_ext <<EOF -#line 1926 "configure" +#line 1968 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1933,7 +1975,7 @@ main() exit(0); } EOF -if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_off_t=`cat conftestval` else @@ -1960,7 +2002,7 @@ if test "${enable_hsizet+set}" = set; then fi echo $ac_n "checking for sizeof hsize_t and hssize_t""... $ac_c" 1>&6 -echo "configure:1964: checking for sizeof hsize_t and hssize_t" >&5 +echo "configure:2006: checking for sizeof hsize_t and hssize_t" >&5 case $HSIZET in no|small) echo "$ac_t""small" 1>&6 @@ -1989,17 +2031,17 @@ case $withval in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1993: checking for $ac_hdr" >&5 +echo "configure:2035: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1998 "configure" +#line 2040 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2026,7 +2068,7 @@ fi done echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6 -echo "configure:2030: checking for compress2 in -lz" >&5 +echo "configure:2072: checking for compress2 in -lz" >&5 ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2034,7 +2076,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 2038 "configure" +#line 2080 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2045,7 +2087,7 @@ int main() { compress2() ; return 0; } EOF -if { (eval echo configure:2049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2075,7 +2117,7 @@ fi ;; no) echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 -echo "configure:2079: checking for GNU zlib" >&5 +echo "configure:2121: checking for GNU zlib" >&5 echo "$ac_t""suppressed" 1>&6 ;; *) @@ -2087,17 +2129,17 @@ echo "configure:2079: checking for GNU zlib" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2091: checking for $ac_hdr" >&5 +echo "configure:2133: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2096 "configure" +#line 2138 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2129,17 +2171,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2133: checking for $ac_hdr" >&5 +echo "configure:2175: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2138 "configure" +#line 2180 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2172,7 +2214,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$zlib_lib" echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6 -echo "configure:2176: checking for compress2 in -lz" >&5 +echo "configure:2218: checking for compress2 in -lz" >&5 ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2180,7 +2222,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 2184 "configure" +#line 2226 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2191,7 +2233,7 @@ int main() { compress2() ; return 0; } EOF -if { (eval echo configure:2195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2221,7 +2263,7 @@ fi else echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6 -echo "configure:2225: checking for compress2 in -lz" >&5 +echo "configure:2267: checking for compress2 in -lz" >&5 ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2229,7 +2271,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 2233 "configure" +#line 2275 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2240,7 +2282,7 @@ int main() { compress2() ; return 0; } EOF -if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2286,65 +2328,21 @@ fi case $withval in yes) - echo $ac_n "checking for main in -ljpeg""... $ac_c" 1>&6 -echo "configure:2291: checking for main in -ljpeg" >&5 -ac_lib_var=`echo jpeg'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ljpeg $LIBS" -cat > conftest.$ac_ext <<EOF -#line 2299 "configure" -#include "confdefs.h" - -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-ljpeg $LIBS" - -else - echo "$ac_t""no" 1>&6 -unset H5TOH4 TESTH5TOH4 -fi - for ac_hdr in mfhdf.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2338: checking for $ac_hdr" >&5 +echo "configure:2336: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2343 "configure" +#line 2341 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2372,7 +2370,7 @@ fi done echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:2376: checking for main in -lmfhdf" >&5 +echo "configure:2374: checking for main in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2380,14 +2378,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <<EOF -#line 2384 "configure" +#line 2382 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2416,7 +2414,7 @@ unset H5TOH4 TESTH5TOH4 fi echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:2420: checking for main in -ldf" >&5 +echo "configure:2418: checking for main in -ldf" >&5 ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2424,14 +2422,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <<EOF -#line 2428 "configure" +#line 2426 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2462,56 +2460,11 @@ fi ;; no) echo $ac_n "checking for HDF4""... $ac_c" 1>&6 -echo "configure:2466: checking for HDF4" >&5 +echo "configure:2464: checking for HDF4" >&5 echo "$ac_t""suppressed" 1>&6 unset H5TOH4 TESTH5TOH4 ;; *) - echo "***************************** OTHER" - echo $ac_n "checking for main in -ljpeg""... $ac_c" 1>&6 -echo "configure:2473: checking for main in -ljpeg" >&5 -ac_lib_var=`echo jpeg'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ljpeg $LIBS" -cat > conftest.$ac_ext <<EOF -#line 2481 "configure" -#include "confdefs.h" - -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:2488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-ljpeg $LIBS" - -else - echo "$ac_t""no" 1>&6 -unset H5TOH4 TESTH5TOH4 -fi - hdf4_inc="`echo $withval |cut -f1 -d,`" if test "X" != "$hdf4_inc"; then saved_CPPFLAGS="$CPPFLAGS" @@ -2520,17 +2473,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2524: checking for $ac_hdr" >&5 +echo "configure:2477: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2529 "configure" +#line 2482 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2564,17 +2517,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2568: checking for $ac_hdr" >&5 +echo "configure:2521: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2573 "configure" +#line 2526 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2607,7 +2560,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$hdf4_lib" echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:2611: checking for main in -lmfhdf" >&5 +echo "configure:2564: checking for main in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2615,14 +2568,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <<EOF -#line 2619 "configure" +#line 2572 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2651,7 +2604,7 @@ unset H5TOH4 TESTH5TOH4 fi echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:2655: checking for main in -ldf" >&5 +echo "configure:2608: checking for main in -ldf" >&5 ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2659,14 +2612,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <<EOF -#line 2663 "configure" +#line 2616 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2696,7 +2649,7 @@ fi else echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:2700: checking for main in -lmfhdf" >&5 +echo "configure:2653: checking for main in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2704,14 +2657,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <<EOF -#line 2708 "configure" +#line 2661 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2739,7 +2692,7 @@ else fi echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:2743: checking for main in -ldf" >&5 +echo "configure:2696: checking for main in -ldf" >&5 ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2747,14 +2700,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <<EOF -#line 2751 "configure" +#line 2704 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2788,9 +2741,9 @@ esac echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:2792: checking for tm_gmtoff in struct tm" >&5 +echo "configure:2745: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext <<EOF -#line 2794 "configure" +#line 2747 "configure" #include "confdefs.h" #include <sys/time.h> @@ -2799,7 +2752,7 @@ int main() { struct tm tm; tm.tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:2803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TM_GMTOFF 1 @@ -2815,9 +2768,9 @@ fi rm -f conftest* echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 -echo "configure:2819: checking for global timezone variable" >&5 +echo "configure:2772: checking for global timezone variable" >&5 cat > conftest.$ac_ext <<EOF -#line 2821 "configure" +#line 2774 "configure" #include "confdefs.h" #include <sys/time.h> @@ -2826,7 +2779,7 @@ int main() { timezone=0; ; return 0; } EOF -if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -2842,12 +2795,12 @@ fi rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2846: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2799: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2851 "configure" +#line 2804 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -2855,7 +2808,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2876,12 +2829,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:2880: checking for tm_zone in struct tm" >&5 +echo "configure:2833: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2885 "configure" +#line 2838 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -2889,7 +2842,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:2893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -2909,12 +2862,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:2913: checking for tzname" >&5 +echo "configure:2866: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2918 "configure" +#line 2871 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -2924,7 +2877,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:2928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -2946,9 +2899,9 @@ EOF fi echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 -echo "configure:2950: checking for struct timezone" >&5 +echo "configure:2903: checking for struct timezone" >&5 cat > conftest.$ac_ext <<EOF -#line 2952 "configure" +#line 2905 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2958,7 +2911,7 @@ int main() { struct timezone tz; tz.tz_minuteswest=0; ; return 0; } EOF -if { (eval echo configure:2962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TIMEZONE 1 @@ -2974,9 +2927,9 @@ fi rm -f conftest* echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:2978: checking for st_blocks in struct stat" >&5 +echo "configure:2931: checking for st_blocks in struct stat" >&5 cat > conftest.$ac_ext <<EOF -#line 2980 "configure" +#line 2933 "configure" #include "confdefs.h" #include <sys/stat.h> @@ -2984,7 +2937,7 @@ int main() { struct stat sb; sb.st_blocks=0; ; return 0; } EOF -if { (eval echo configure:2988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STAT_ST_BLOCKS 1 @@ -3002,12 +2955,12 @@ rm -f conftest* for ac_func in _getvideoconfig gettextinfo GetConsoleScreenBufferInfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3006: checking for $ac_func" >&5 +echo "configure:2959: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3011 "configure" +#line 2964 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3030,7 +2983,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3057,12 +3010,12 @@ done for ac_func in _scrsize ioctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3061: checking for $ac_func" >&5 +echo "configure:3014: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3066 "configure" +#line 3019 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3085,7 +3038,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3111,16 +3064,16 @@ done echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6 -echo "configure:3115: checking for struct videoconfig" >&5 +echo "configure:3068: checking for struct videoconfig" >&5 cat > conftest.$ac_ext <<EOF -#line 3117 "configure" +#line 3070 "configure" #include "confdefs.h" int main() { struct videoconfig w; w.numtextcols=0; ; return 0; } EOF -if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_VIDEOCONFIG 1 @@ -3136,16 +3089,16 @@ fi rm -f conftest* echo $ac_n "checking for struct text_info""... $ac_c" 1>&6 -echo "configure:3140: checking for struct text_info" >&5 +echo "configure:3093: checking for struct text_info" >&5 cat > conftest.$ac_ext <<EOF -#line 3142 "configure" +#line 3095 "configure" #include "confdefs.h" int main() { struct text_info w; w.screenwidth=0; ; return 0; } EOF -if { (eval echo configure:3149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TEXT_INFO 1 @@ -3161,16 +3114,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:3165: checking for TIOCGWINSZ" >&5 +echo "configure:3118: checking for TIOCGWINSZ" >&5 cat > conftest.$ac_ext <<EOF -#line 3167 "configure" +#line 3120 "configure" #include "confdefs.h" #include <sys/ioctl.h> int main() { int w=TIOCGWINSZ; ; return 0; } EOF -if { (eval echo configure:3174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGWINSZ 1 @@ -3186,16 +3139,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6 -echo "configure:3190: checking for TIOCGGETD" >&5 +echo "configure:3143: checking for TIOCGGETD" >&5 cat > conftest.$ac_ext <<EOF -#line 3192 "configure" +#line 3145 "configure" #include "confdefs.h" #include <sys/ioctl.h> int main() { int w=TIOCGETD; ; return 0; } EOF -if { (eval echo configure:3199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGETD 1 @@ -3214,12 +3167,12 @@ rm -f conftest* for ac_func in getpwuid gethostname system getrusage fork waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3218: checking for $ac_func" >&5 +echo "configure:3171: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3223 "configure" +#line 3176 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3242,7 +3195,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3269,12 +3222,12 @@ done for ac_func in gettimeofday BSDgettimeofday difftime sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3273: checking for $ac_func" >&5 +echo "configure:3226: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3278 "configure" +#line 3231 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3297,7 +3250,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3323,24 +3276,24 @@ done cat > conftest.$ac_ext <<EOF -#line 3327 "configure" +#line 3280 "configure" #include "confdefs.h" #include<sys/types.h> int main() { off64_t n = 0; ; return 0; } EOF -if { (eval echo configure:3334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* for ac_func in lseek64 fseek64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3339: checking for $ac_func" >&5 +echo "configure:3292: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3344 "configure" +#line 3297 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3363,7 +3316,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3398,12 +3351,12 @@ rm -f conftest* echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3402: checking for working const" >&5 +echo "configure:3355: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3407 "configure" +#line 3360 "configure" #include "confdefs.h" int main() { @@ -3452,7 +3405,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:3456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3473,21 +3426,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3477: checking for inline" >&5 +echo "configure:3430: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 3484 "configure" +#line 3437 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:3491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3514,16 +3467,16 @@ esac echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6 -echo "configure:3518: checking for __attribute__ extension" >&5 +echo "configure:3471: checking for __attribute__ extension" >&5 cat > conftest.$ac_ext <<EOF -#line 3520 "configure" +#line 3473 "configure" #include "confdefs.h" int main() { int __attribute__((unused)) f(void){return 1;} ; return 0; } EOF -if { (eval echo configure:3527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_ATTRIBUTE 1 @@ -3539,16 +3492,16 @@ fi rm -f conftest* echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6 -echo "configure:3543: checking for __FUNCTION__ extension" >&5 +echo "configure:3496: checking for __FUNCTION__ extension" >&5 cat > conftest.$ac_ext <<EOF -#line 3545 "configure" +#line 3498 "configure" #include "confdefs.h" int main() { int f(void){return __FUNCTION__;} ; return 0; } EOF -if { (eval echo configure:3552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FUNCTION 1 @@ -3564,7 +3517,7 @@ fi rm -f conftest* echo $ac_n "checking how to print long long""... $ac_c" 1>&6 -echo "configure:3568: checking how to print long long" >&5 +echo "configure:3521: checking how to print long long" >&5 if eval "test \"`echo '$''{'hdf5_cv_printf_ll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3573,7 +3526,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3577 "configure" +#line 3530 "configure" #include "confdefs.h" #include <stdio.h> @@ -3584,7 +3537,7 @@ else sprintf(s,"%${hdf5_cv_printf_ll}d",x); exit (strcmp(s,"1099511627776"));} EOF -if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then break else @@ -3605,7 +3558,7 @@ EOF echo $ac_n "checking for debug flags""... $ac_c" 1>&6 -echo "configure:3609: checking for debug flags" >&5 +echo "configure:3562: checking for debug flags" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -3637,7 +3590,7 @@ if test "X" != "X$DEBUG_PKG"; then fi echo $ac_n "checking for API tracing""... $ac_c" 1>&6 -echo "configure:3641: checking for API tracing" >&5; +echo "configure:3594: checking for API tracing" >&5; # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -3660,7 +3613,7 @@ if test "${enable_parallel+set}" = set; then fi echo $ac_n "checking for parallel support""... $ac_c" 1>&6 -echo "configure:3664: checking for parallel support" >&5; +echo "configure:3617: checking for parallel support" >&5; @@ -3687,7 +3640,7 @@ case "X-$PARALLEL" in EOF echo $ac_n "checking for main in -lmpi""... $ac_c" 1>&6 -echo "configure:3691: checking for main in -lmpi" >&5 +echo "configure:3644: checking for main in -lmpi" >&5 ac_lib_var=`echo mpi'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3695,14 +3648,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpi $LIBS" cat > conftest.$ac_ext <<EOF -#line 3699 "configure" +#line 3652 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3729,7 +3682,7 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for main in -lmpio""... $ac_c" 1>&6 -echo "configure:3733: checking for main in -lmpio" >&5 +echo "configure:3686: checking for main in -lmpio" >&5 ac_lib_var=`echo mpio'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3737,14 +3690,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpio $LIBS" cat > conftest.$ac_ext <<EOF -#line 3741 "configure" +#line 3694 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -720,6 +720,16 @@ H5G_init_interface(void) static void H5G_term_interface(void) { + size_t i; + + /* Empty the object type table */ + for (i=0; i<H5G_ntypes_g; i++) { + H5MM_xfree(H5G_type_g[i].desc); + } + H5G_ntypes_g = H5G_atypes_g = 0; + H5G_type_g = H5MM_xfree(H5G_type_g); + + /* Destroy the group object id group */ H5I_destroy_group(H5I_GROUP); } diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 2e34c36..1c631e3 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -29,6 +29,364 @@ typedef struct H5T_conv_struct_t { static intn interface_initialize_g = FALSE; #define INTERFACE_INIT NULL +/* + * These macros are for the bodies of functions that convert buffers of one + * integer type to another using hardware. They all start with `H5T_CONV_' + * and end with two letters that represent the source and destination types, + * respectively. The letters `s' and `S' refer to signed values while the + * letters `u' and `U' refer to unsigned values. The letter which is + * capitalized indicates that the corresponding type (source or destination) + * is at least as large as the other type. Certain conversions may + * experience overflow conditions which arise when the source value has a + * magnitude that cannot be represented by the destination type. + * + * Suffix Description + * ------ ----------- + * sS: Signed integers to signed integers where the destination is + * at least as wide as the source. This case cannot generate + * overflows. + * + * sU: Signed integers to unsigned integers where the destination is + * at least as wide as the source. This case experiences + * overflows when the source value is negative. + * + * uS: Unsigned integers to signed integers where the destination is + * at least as wide as the source. This case can experience + * overflows when the source and destination are the same size. + * + * uU: Unsigned integers to unsigned integers where the destination + * is at least as wide as the source. Overflows are not + * possible in this case. + * + * Ss: Signed integers to signed integers where the source is at + * least as large as the destination. Overflows can occur when + * the destination is narrower than the source. + * + * Su: Signed integers to unsigned integers where the source is at + * least as large as the destination. Overflows occur when the + * source value is negative and can also occur if the + * destination is narrower than the source. + * + * Us: Unsigned integers to signed integers where the source is at + * least as large as the destination. Overflows can occur for + * all sizes. + * + * Uu: Unsigned integers to unsigned integers where the source is at + * least as large as the destination. Overflows can occur if the + * destination is narrower than the source. + * + * The macros take a subset of these arguments in the order listed here: + * + * CDATA: A pointer to the H5T_cdata_t structure that was passed to the + * conversion function. + * + * S_ID: The hid_t value for the source data type. + * + * D_ID: The hid_t value for the destination data type. + * + * BUF: A pointer to the conversion buffer. + * + * NELMTS: The number of values to be converted. + * + * ST: The C name for source data type (e.g., int) + * + * DT: The C name for the destination data type (e.g., signed char) + * + * D_MIN: The minimum possible destination value. For unsigned + * destination types this should be zero. For signed + * destination types it's a negative value with a magnitude that + * is usually one greater than D_MAX. Source values which are + * smaller than D_MIN generate overflows. + * + * D_MAX: The maximum possible destination value. Source values which + * are larger than D_MAX generate overflows. + * + */ + +#define H5T_CONV_sS(CDATA,BUF,NELMTS,ST,DT) { \ + size_t elmtno; /*element number */ \ + ST *s; /*source buffer */ \ + DT *d; /*destination buffer */ \ + \ + assert(sizeof(ST)<=sizeof(DT)); \ + switch ((CDATA)->command) { \ + case H5T_CONV_INIT: \ + (CDATA)->need_bkg = H5T_BKG_NO; \ + break; \ + \ + case H5T_CONV_FREE: \ + break; \ + \ + case H5T_CONV_CONV: \ + s = (ST*)(BUF)+(NELMTS); \ + d = (DT*)(BUF)+(NELMTS); \ + \ + for (elmtno=0; elmtno<(NELMTS); elmtno++) { \ + *--d = *--s; \ + } \ + break; \ + \ + default: \ + HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, \ + "unknown conversion command"); \ + } \ +} + +#define H5T_CONV_sU(CDATA,S_ID,D_ID,BUF,NELMTS,ST,DT) { \ + size_t elmtno; /*element number */ \ + ST *s; /*source buffer */ \ + DT *d; /*destination buffer */ \ + \ + assert(sizeof(ST)<=sizeof(DT)); \ + switch ((CDATA)->command) { \ + case H5T_CONV_INIT: \ + (CDATA)->need_bkg = H5T_BKG_NO; \ + break; \ + \ + case H5T_CONV_FREE: \ + break; \ + \ + case H5T_CONV_CONV: \ + s = (ST*)(BUF)+(NELMTS)-1; \ + d = (DT*)(BUF)+(NELMTS)-1; \ + \ + for (elmtno=0; elmtno<(NELMTS); elmtno++, --s, --d) { \ + if (*s<0) { \ + if (!H5T_overflow_g || \ + (H5T_overflow_g)((S_ID), (D_ID), s, d)<0) { \ + *d = 0; \ + } \ + } else { \ + *d = *s; \ + } \ + } \ + break; \ + \ + default: \ + HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, \ + "unknown conversion command"); \ + } \ +} + +#define H5T_CONV_uS(CDATA,S_ID,D_ID,BUF,NELMTS,ST,DT,D_MAX) { \ + size_t elmtno; /*element number */ \ + ST *s; /*source buffer */ \ + DT *d; /*destination buffer */ \ + \ + assert(sizeof(ST)<=sizeof(DT)); \ + switch ((CDATA)->command) { \ + case H5T_CONV_INIT: \ + (CDATA)->need_bkg = H5T_BKG_NO; \ + break; \ + \ + case H5T_CONV_FREE: \ + break; \ + \ + case H5T_CONV_CONV: \ + s = (ST*)(BUF)+(NELMTS)-1; \ + d = (DT*)(BUF)+(NELMTS)-1; \ + \ + for (elmtno=0; elmtno<(NELMTS); elmtno++, --s, --d) { \ + if (*s > (D_MAX)) { \ + if (!H5T_overflow_g || \ + (H5T_overflow_g)((S_ID), (D_ID), s, d)<0) { \ + *d = (D_MAX); \ + } \ + } else { \ + *d = *s; \ + } \ + } \ + break; \ + \ + default: \ + HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, \ + "unknown conversion command"); \ + } \ +} + +#define H5T_CONV_uU(CDATA,BUF,NELMTS,ST,DT) { \ + size_t elmtno; /*element number */ \ + ST *s; /*source buffer */ \ + DT *d; /*destination buffer */ \ + \ + assert(sizeof(ST)<=sizeof(DT)); \ + switch ((CDATA)->command) { \ + case H5T_CONV_INIT: \ + (CDATA)->need_bkg = H5T_BKG_NO; \ + break; \ + \ + case H5T_CONV_FREE: \ + break; \ + \ + case H5T_CONV_CONV: \ + s = (ST*)(BUF)+(NELMTS); \ + d = (DT*)(BUF)+(NELMTS); \ + \ + for (elmtno=0; elmtno<(NELMTS); elmtno++) { \ + *--d = *--s; \ + } \ + break; \ + \ + default: \ + HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, \ + "unknown conversion command"); \ + } \ +} + +#define H5T_CONV_Ss(CDATA,S_ID,D_ID,BUF,NELMTS,ST,DT,D_MIN,D_MAX) { \ + size_t elmtno; /*element number */ \ + ST *s; /*source buffer */ \ + DT *d; /*destination buffer */ \ + \ + assert(sizeof(ST)>=sizeof(DT)); \ + switch ((CDATA)->command) { \ + case H5T_CONV_INIT: \ + (CDATA)->need_bkg = H5T_BKG_NO; \ + break; \ + \ + case H5T_CONV_FREE: \ + break; \ + \ + case H5T_CONV_CONV: \ + s = (ST*)(BUF); \ + d = (DT*)(BUF); \ + \ + for (elmtno=0; elmtno<(NELMTS); elmtno++, d++, s++) { \ + if (*s > (D_MAX)) { \ + if (!H5T_overflow_g || \ + (H5T_overflow_g)((S_ID), (D_ID), s, d)<0) { \ + *d = (D_MAX); \ + } \ + } else if (*s < (D_MIN)) { \ + if (!H5T_overflow_g || \ + (H5T_overflow_g)((S_ID), (D_ID), s, d)<0) { \ + *d = (D_MIN); \ + } \ + } else { \ + *d = *s; \ + } \ + } \ + break; \ + \ + default: \ + HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, \ + "unknown conversion command"); \ + } \ +} + +#define H5T_CONV_Su(CDATA,S_ID,D_ID,BUF,NELMTS,ST,DT,D_MAX) { \ + size_t elmtno; /*element number */ \ + ST *s; /*source buffer */ \ + DT *d; /*destination buffer */ \ + \ + assert(sizeof(ST)>=sizeof(DT)); \ + switch ((CDATA)->command) { \ + case H5T_CONV_INIT: \ + (CDATA)->need_bkg = H5T_BKG_NO; \ + break; \ + \ + case H5T_CONV_FREE: \ + break; \ + \ + case H5T_CONV_CONV: \ + s = (ST*)(BUF); \ + d = (DT*)(BUF); \ + \ + for (elmtno=0; elmtno<(NELMTS); elmtno++, d++, s++) { \ + if (sizeof(ST)>sizeof(DT) && *s>(D_MAX)) {/*sign vs. unsign ok*/ \ + if (!H5T_overflow_g || \ + (H5T_overflow_g)((S_ID), (D_ID), s, d)<0) { \ + *d = (D_MAX); \ + } \ + } else if (*s < 0) { \ + if (!H5T_overflow_g || \ + (H5T_overflow_g)((S_ID), (D_ID), s, d)<0) { \ + *d = 0; \ + } \ + } else { \ + *d = *s; \ + } \ + } \ + break; \ + \ + default: \ + HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, \ + "unknown conversion command"); \ + } \ +} + +#define H5T_CONV_Us(CDATA,S_ID,D_ID,BUF,NELMTS,ST,DT,D_MAX) { \ + size_t elmtno; /*element number */ \ + ST *s; /*source buffer */ \ + DT *d; /*destination buffer */ \ + \ + assert(sizeof(ST)>=sizeof(DT)); \ + switch ((CDATA)->command) { \ + case H5T_CONV_INIT: \ + (CDATA)->need_bkg = H5T_BKG_NO; \ + break; \ + \ + case H5T_CONV_FREE: \ + break; \ + \ + case H5T_CONV_CONV: \ + s = (ST*)(BUF); \ + d = (DT*)(BUF); \ + \ + for (elmtno=0; elmtno<(NELMTS); elmtno++, d++, s++) { \ + if (*s > (D_MAX)) { \ + if (!H5T_overflow_g || \ + (H5T_overflow_g)((S_ID), (D_ID), s, d)<0) { \ + *d = (D_MAX); \ + } \ + } else { \ + *d = *s; \ + } \ + } \ + break; \ + \ + default: \ + HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, \ + "unknown conversion command"); \ + } \ +} + +#define H5T_CONV_Uu(CDATA,S_ID,D_ID,BUF,NELMTS,ST,DT,D_MAX) { \ + size_t elmtno; /*element number */ \ + ST *s; /*source buffer */ \ + DT *d; /*destination buffer */ \ + \ + assert(sizeof(ST)>=sizeof(DT)); \ + switch ((CDATA)->command) { \ + case H5T_CONV_INIT: \ + (CDATA)->need_bkg = H5T_BKG_NO; \ + break; \ + \ + case H5T_CONV_FREE: \ + break; \ + \ + case H5T_CONV_CONV: \ + s = (ST*)(BUF); \ + d = (DT*)(BUF); \ + \ + for (elmtno=0; elmtno<(NELMTS); elmtno++, d++, s++) { \ + if (*s > (D_MAX)) { \ + if (!H5T_overflow_g || \ + (H5T_overflow_g)((S_ID), (D_ID), s, d)<0) { \ + *d = (D_MAX); \ + } \ + } else { \ + *d = *s; \ + } \ + } \ + break; \ + \ + default: \ + HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, \ + "unknown conversion command"); \ + } \ +} + /*------------------------------------------------------------------------- * Function: H5T_conv_noop * @@ -1532,7 +1890,1299 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, H5MM_xfree(dbuf); FUNC_LEAVE(ret_value); } - + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_char_short + * + * Purpose: Convertes `signed char' to `short' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_char_short(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_char_short, FAIL); + H5T_CONV_sS(cdata, buf, nelmts, signed char, short); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_char_ushort + * + * Purpose: Convertes `signed char' to `unsigned short' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_char_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_char_ushort, FAIL); + H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts, + signed char, unsigned short); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uchar_short + * + * Purpose: Converts `unsigned char' to `short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uchar_short, FAIL); + H5T_CONV_uS(cdata, src_id, dst_id, buf, nelmts, + unsigned char, short, SHRT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uchar_ushort + * + * Purpose: Converts `unsigned char' to `unsigned short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uchar_ushort(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uchar_ushort, FAIL); + H5T_CONV_uU(cdata, buf, nelmts, unsigned char, unsigned short); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_char_int + * + * Purpose: Converts `signed char' to `int' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_char_int(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_char_int, FAIL); + H5T_CONV_sS(cdata, buf, nelmts, signed char, int); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_char_uint + * + * Purpose: Convertes `signed char' to `unsigned int' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_char_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_char_uint, FAIL); + H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts, signed char, unsigned); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uchar_int + * + * Purpose: Convertes `unsigned char' to `int' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uchar_int, FAIL); + H5T_CONV_uS(cdata, src_id, dst_id, buf, nelmts, + unsigned char, int, INT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uchar_uint + * + * Purpose: Converts `unsigned char' to `unsigned int' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uchar_uint(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uchar_uint, FAIL); + H5T_CONV_uU(cdata, buf, nelmts, unsigned char, unsigned); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_char_long + * + * Purpose: Converts `signed char' to `long' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_char_long(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_char_long, FAIL); + H5T_CONV_sS(cdata, buf, nelmts, signed char, long); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_char_ulong + * + * Purpose: Convertes `signed char' to `unsigned long' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_char_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_char_ulong, FAIL); + H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts, + signed char, unsigned long); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uchar_long + * + * Purpose: Convertes `unsigned char' to `long' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uchar_long, FAIL); + H5T_CONV_uS(cdata, src_id, dst_id, buf, nelmts, + unsigned char, long, LONG_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uchar_ulong + * + * Purpose: Converts `unsigned char' to `unsigned long' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uchar_ulong(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uchar_ulong, FAIL); + H5T_CONV_uU(cdata, buf, nelmts, unsigned char, unsigned long); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_short_char + * + * Purpose: Converts `short' to `signed char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_short_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_short_char, FAIL); + H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts, + short, signed char, CHAR_MIN, CHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_short_uchar + * + * Purpose: Converts `short' to `unsigned char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_short_uchar, FAIL); + H5T_CONV_Su(cdata, src_id, dst_id, buf, nelmts, + short, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ushort_char + * + * Purpose: Converts `unsigned short' to `signed char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ushort_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ushort_char, FAIL); + H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts, + unsigned short, signed char, CHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ushort_uchar + * + * Purpose: Converts `unsigned short' to `unsigned char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ushort_uchar, FAIL); + H5T_CONV_Uu(cdata, src_id, dst_id, buf, nelmts, + unsigned short, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_short_int + * + * Purpose: Converts `short' to `int' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_short_int(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_short_int, FAIL); + H5T_CONV_sS(cdata, buf, nelmts, short, int); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_short_uint + * + * Purpose: Convertes `short' to `unsigned int' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_short_uint, FAIL); + H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts, short, unsigned); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ushort_int + * + * Purpose: Convertes `unsigned short' to `int' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ushort_int, FAIL); + H5T_CONV_uS(cdata, src_id, dst_id, buf, nelmts, + unsigned short, int, INT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ushort_uint + * + * Purpose: Converts `unsigned short' to `unsigned int' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ushort_uint(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ushort_uint, FAIL); + H5T_CONV_uU(cdata, buf, nelmts, unsigned short, unsigned); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_short_long + * + * Purpose: Converts `short' to `long' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_short_long(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_short_long, FAIL); + H5T_CONV_sS(cdata, buf, nelmts, short, long); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_short_ulong + * + * Purpose: Convertes `short' to `unsigned long' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_short_ulong, FAIL); + H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts, short, unsigned long); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ushort_long + * + * Purpose: Convertes `unsigned short' to `long' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ushort_long, FAIL); + H5T_CONV_uS(cdata, src_id, dst_id, buf, nelmts, + unsigned short, long, LONG_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ushort_ulong + * + * Purpose: Converts `unsigned short' to `unsigned long' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ushort_ulong(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ushort_ulong, FAIL); + H5T_CONV_uU(cdata, buf, nelmts, unsigned short, unsigned long); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_int_char + * + * Purpose: Converts `int' to `signed char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_int_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_int_char, FAIL); + H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts, + int, signed char, CHAR_MIN, CHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_int_uchar + * + * Purpose: Converts `int' to `unsigned char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_int_uchar, FAIL); + H5T_CONV_Su(cdata, src_id, dst_id, buf, nelmts, + int, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uint_char + * + * Purpose: Converts `unsigned int' to `signed char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uint_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uint_char, FAIL); + H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts, + unsigned, signed char, CHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uint_uchar + * + * Purpose: Converts `unsigned int' to `unsigned char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uint_uchar, FAIL); + H5T_CONV_Uu(cdata, src_id, dst_id, buf, nelmts, + unsigned, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_int_short + * + * Purpose: Converts `int' to `short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_int_short, FAIL); + H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts, + int, short, SHRT_MIN, SHRT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_int_ushort + * + * Purpose: Converts `int' to `unsigned short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_int_ushort, FAIL); + H5T_CONV_Su(cdata, src_id, dst_id, buf, nelmts, + int, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uint_short + * + * Purpose: Converts `unsigned int' to `short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uint_short, FAIL); + H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts, + unsigned, short, SHRT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uint_ushort + * + * Purpose: Converts `unsigned int' to `unsigned short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uint_ushort, FAIL); + H5T_CONV_Uu(cdata, src_id, dst_id, buf, nelmts, + unsigned, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_int_long + * + * Purpose: Converts `int' to `long' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_int_long(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_int_long, FAIL); + H5T_CONV_sS(cdata, buf, nelmts, int, long); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_int_ulong + * + * Purpose: Convertes `int' to `unsigned long' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_int_ulong, FAIL); + H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts, int, unsigned long); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uint_long + * + * Purpose: Convertes `unsigned int' to `long' + * + * Return: Success: Non-negative + * + * Failure: Negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uint_long, FAIL); + H5T_CONV_uS(cdata, src_id, dst_id, buf, nelmts, + unsigned, long, LONG_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_uint_ulong + * + * Purpose: Converts `unsigned int' to `unsigned long' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_uint_ulong(hid_t __unused__ src_id, hid_t __unused__ dst_id, + H5T_cdata_t *cdata, size_t nelmts, void *buf, + void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_uint_ulong, FAIL); + H5T_CONV_uU(cdata, buf, nelmts, unsigned, unsigned long); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_long_char + * + * Purpose: Converts `long' to `signed char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_long_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_long_char, FAIL); + H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts, + long, signed char, CHAR_MIN, CHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_long_uchar + * + * Purpose: Converts `long' to `unsigned char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_long_uchar, FAIL); + H5T_CONV_Su(cdata, src_id, dst_id, buf, nelmts, + long, unsigned char, CHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ulong_char + * + * Purpose: Converts `unsigned long' to `signed char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ulong_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ulong_char, FAIL); + H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts, + unsigned long, signed char, CHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ulong_uchar + * + * Purpose: Converts `unsigned long' to `unsigned char' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ulong_uchar, FAIL); + H5T_CONV_Uu(cdata, src_id, dst_id, buf, nelmts, + unsigned long, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_long_short + * + * Purpose: Converts `long' to `short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_long_short, FAIL); + H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts, + long, short, SHRT_MIN, SHRT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_long_ushort + * + * Purpose: Converts `long' to `unsigned short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_long_ushort, FAIL); + H5T_CONV_Su(cdata, src_id, dst_id, buf, nelmts, + long, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ulong_short + * + * Purpose: Converts `unsigned long' to `short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ulong_short, FAIL); + H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts, + unsigned long, short, SHRT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ulong_ushort + * + * Purpose: Converts `unsigned long' to `unsigned short' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ulong_ushort, FAIL); + H5T_CONV_Uu(cdata, src_id, dst_id, buf, nelmts, + unsigned long, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_long_int + * + * Purpose: Converts `long' to `int' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_long_int, FAIL); + H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts, + long, int, INT_MIN, INT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_long_uint + * + * Purpose: Converts `long' to `unsigned int' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_long_uint, FAIL); + H5T_CONV_Su(cdata, src_id, dst_id, buf, nelmts, + long, unsigned, UINT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ulong_int + * + * Purpose: Converts `unsigned long' to `int' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ulong_int, FAIL); + H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts, + unsigned long, int, INT_MAX); + FUNC_LEAVE(SUCCEED); +} + + +/*------------------------------------------------------------------------- + * Function: H5T_conv_ulong_uint + * + * Purpose: Converts `unsigned long' to `unsigned int' + * + * Return: Success: non-negative + * + * Failure: negative + * + * Programmer: Robb Matzke + * Friday, November 13, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +herr_t +H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void __unused__ *bkg) +{ + FUNC_ENTER(H5T_conv_ulong_uint, FAIL); + H5T_CONV_Uu(cdata, src_id, dst_id, buf, nelmts, + unsigned long, unsigned, UINT_MAX); + FUNC_LEAVE(SUCCEED); +} + /*------------------------------------------------------------------------- * Function: H5T_conv_float_double diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 2c7621b..13fa389 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -135,17 +135,126 @@ herr_t H5T_conv_order (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, herr_t H5T_conv_struct (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *_buf, void *bkg); herr_t H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, - size_t nelmts, void *_buf, void __unused__ *bkg); + size_t nelmts, void *_buf, void *bkg); herr_t H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, - size_t nelmts, void *_buf, void __unused__ *bkg); + size_t nelmts, void *_buf, void *bkg); herr_t H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, - size_t nelmts, void *_buf, void __unused__ *bkg); + size_t nelmts, void *_buf, void *bkg); + +herr_t H5T_conv_char_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_char_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_char_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_char_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_char_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_char_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_short_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ushort_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_int_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uint_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_long_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ulong_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + +herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); +herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + size_t nelmts, void *buf, void *bkg); + herr_t H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, - size_t nelmts, void *buf, void __unused__ *bkg); + size_t nelmts, void *buf, void *bkg); herr_t H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, - size_t nelmts, void *buf, void __unused__ *bkg); + size_t nelmts, void *buf, void *bkg); herr_t H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, - size_t nelmts, void *_buf, void __unused__ *bkg); + size_t nelmts, void *_buf, void *bkg); /* Bit twiddling functions */ void H5T_bit_copy (uint8 *dst, size_t dst_offset, const uint8 *src, diff --git a/src/Makefile.in b/src/Makefile.in index d6629a6..d5c152e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -19,9 +19,9 @@ LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c \ H5Fstdio.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 H5TB.c H5V.c \ - H5Z.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 \ + H5TB.c H5V.c H5Z.c LIB_OBJ=$(LIB_SRC:.c=.o) diff --git a/test/Makefile.in b/test/Makefile.in index b52b95e..2003916 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,4 +1,4 @@ -# HDF5 Library Test Makefile(.in) -*- makefile -*- +# HDF5 Library Test Makefile(.in) # # Copyright (C) 1997 National Center for Supercomputing Applications. # All rights reserved. @@ -13,8 +13,9 @@ LIBS=../src/libhdf5.a @LIBS@ # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. -TESTS=testhdf5 gheap hyperslab istore bittests dtypes dsets cmpd_dset extend \ - external shtype links unlink big mtime fillval mount flush1 flush2 +TEST_PROGS=testhdf5 gheap hyperslab istore bittests dtypes dsets cmpd_dset \ + extend external shtype links unlink big mtime fillval mount flush1 \ + flush2 TIMINGS=iopipe chunk ragged overhead # Temporary files @@ -55,7 +56,7 @@ timings _timings: $(TIMINGS) done; # How to build the tests... They all depend on the hdf5 library. -$(TESTS): ../src/libhdf5.a +$(TEST_PROGS): ../src/libhdf5.a TESTHDF5_OBJ=testhdf5.o tattr.o tfile.o theap.o tmeta.o tohdr.o trefer.o tselect.o tstab.o th5s.o testhdf5: $(TESTHDF5_OBJ) $(CC) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LDFLAGS) $(LIBS) diff --git a/tools/Makefile.in b/tools/Makefile.in index d6840bf..9306e3b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -11,15 +11,13 @@ CPPFLAGS=-I../src -I. @CPPFLAGS@ LIBS=../src/libhdf5.a libh5tools.a @LIBS@ -# Tools test targets. -# Use /bin/sh to use because the test is actually a shell script file. -TESTS=testh5dump -RUNTEST=/bin/sh +# Test programs and scripts. +TEST_PROGS= +TEST_SCRIPTS=testh5dump.sh @TESTH5TOH4@ -# These are our main targets: library, programs, and tests +# These are our main targets: library and tools. LIB=libh5tools.a PROGS=h5debug h5import h5ls h5repart h5dump @H5TOH4@ -TESTS=@TESTH5TOH4@ # Source and object files for the library. LIB_SRC=h5tools.c @@ -31,7 +29,7 @@ PROG_OBJ=$(PROG_SRC:.c=.o) PRIVATE_HDR=h5tools.h # Source and object files for the tests -TEST_SRC=testh5toh4.c +TEST_SRC= TEST_OBJ=$(TEST_SRC:.c=.o) # Programs have to be built before they can be tested! @@ -56,13 +54,4 @@ h5repart: h5repart.o h5dump: h5dump.o h5dumputil.o $(CC) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LDFLAGS) $(LIBS) -# How to build the tests. The testh5dump is a shell script that we -# copy from its permanent home to a temporary name because `make -# clean' will remove the temporary name. -testh5dump: testh5dump.sh - cp testh5dump.sh $@ - -testh5toh4: testh5toh4.o - $(CC) $(CFLAGS) -o $@ testh5toh4 $(LDFLAGS) $(LIBS) - @CONCLUDE@ |