From 52bb2a205de315f653c3ff825e00268cd4d1e671 Mon Sep 17 00:00:00 2001 From: Robb Matzke Date: Mon, 14 Jun 1999 10:07:49 -0500 Subject: [svn-r1340] Changes since 19990611 ---------------------- ./doc/html/H5.format.html Added documentation for opaque data types (bitfield types were already documented but they were out of order). ./src/H5E.c Fixed a bug with glibc2 on linux systems where `stdout' is an extern and can't be used to initialize static data. ./src/H5T.c ./src/H5Tpkg.h ./src/H5Tpublic.h ./src/H5detect.c Removed the `_T' from the new C9x types I just added so the names are consistent with existing types. Besides, the fact that something is a datatype is obvious because it starts with H5T_NATIVE_. ./tools/h5ls.c Added the new C9x data types. H5ls prints one of these types only if it doesn't match one of the builtin C types. Prints the OID for shared data types. Fixed a formatting bug with symbolic links which was introduced a few changes ago. The commandline has been changed so that objects from multiple files can be listed with a single command. Instead of specifying a file name and an optional list of objects, each thing to print is a file name and object concatenated. H5ls figures out how to devide the name into a file name and object name even when the file name part doesn't correspond to an actual Unix file. Old syntax: h5ls [OPTIONS] FILE [OBJECTS] New syntax: h5ls [OPTIONS] FILE[/OBJECT] [FILE[/OBJECT]]... Example ({X,Y} is expanded by the shell) Old command: h5ls -d ../test/x.data dir1 dir2 New command: h5ls -d ../test/x.data/{dir1,dir2} The filename is printed as part of the object name when full names are requested (--full or --recursive). If people really don't like this they can undefine a constant at the top of h5ls. Errors from the hdf5 library are turned off. Commandline switches of the form `--width 80' are accepted in addition to `--width=80'. This is more symmetric with single-letter switches that take two forms: `-w 80' and `-w80'. ./src/H5D.c Added tracing instrumentation for H5Dvlen_reclaim(). ./src/H5private.h Added casts to int for the isalpha() et al macros to shut up solaris warnings about char subscripts. --- src/H5T.c | 202 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 103 insertions(+), 99 deletions(-) diff --git a/src/H5T.c b/src/H5T.c index 696f4ff..0f0465a 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -97,30 +97,34 @@ hid_t H5T_NATIVE_HSIZE_g = FAIL; hid_t H5T_NATIVE_HSSIZE_g = FAIL; hid_t H5T_NATIVE_HERR_g = FAIL; hid_t H5T_NATIVE_HBOOL_g = FAIL; -hid_t H5T_NATIVE_INT8_T_g = FAIL; -hid_t H5T_NATIVE_UINT8_T_g = FAIL; -hid_t H5T_NATIVE_INT_LEAST8_T_g = FAIL; -hid_t H5T_NATIVE_UINT_LEAST8_T_g = FAIL; -hid_t H5T_NATIVE_INT_FAST8_T_g = FAIL; -hid_t H5T_NATIVE_UINT_FAST8_T_g = FAIL; -hid_t H5T_NATIVE_INT16_T_g = FAIL; -hid_t H5T_NATIVE_UINT16_T_g = FAIL; -hid_t H5T_NATIVE_INT_LEAST16_T_g = FAIL; -hid_t H5T_NATIVE_UINT_LEAST16_T_g = FAIL; -hid_t H5T_NATIVE_INT_FAST16_T_g = FAIL; -hid_t H5T_NATIVE_UINT_FAST16_T_g = FAIL; -hid_t H5T_NATIVE_INT32_T_g = FAIL; -hid_t H5T_NATIVE_UINT32_T_g = FAIL; -hid_t H5T_NATIVE_INT_LEAST32_T_g = FAIL; -hid_t H5T_NATIVE_UINT_LEAST32_T_g = FAIL; -hid_t H5T_NATIVE_INT_FAST32_T_g = FAIL; -hid_t H5T_NATIVE_UINT_FAST32_T_g = FAIL; -hid_t H5T_NATIVE_INT64_T_g = FAIL; -hid_t H5T_NATIVE_UINT64_T_g = FAIL; -hid_t H5T_NATIVE_INT_LEAST64_T_g = FAIL; -hid_t H5T_NATIVE_UINT_LEAST64_T_g = FAIL; -hid_t H5T_NATIVE_INT_FAST64_T_g = FAIL; -hid_t H5T_NATIVE_UINT_FAST64_T_g = FAIL; + +hid_t H5T_NATIVE_INT8_g = FAIL; +hid_t H5T_NATIVE_UINT8_g = FAIL; +hid_t H5T_NATIVE_INT_LEAST8_g = FAIL; +hid_t H5T_NATIVE_UINT_LEAST8_g = FAIL; +hid_t H5T_NATIVE_INT_FAST8_g = FAIL; +hid_t H5T_NATIVE_UINT_FAST8_g = FAIL; + +hid_t H5T_NATIVE_INT16_g = FAIL; +hid_t H5T_NATIVE_UINT16_g = FAIL; +hid_t H5T_NATIVE_INT_LEAST16_g = FAIL; +hid_t H5T_NATIVE_UINT_LEAST16_g = FAIL; +hid_t H5T_NATIVE_INT_FAST16_g = FAIL; +hid_t H5T_NATIVE_UINT_FAST16_g = FAIL; + +hid_t H5T_NATIVE_INT32_g = FAIL; +hid_t H5T_NATIVE_UINT32_g = FAIL; +hid_t H5T_NATIVE_INT_LEAST32_g = FAIL; +hid_t H5T_NATIVE_UINT_LEAST32_g = FAIL; +hid_t H5T_NATIVE_INT_FAST32_g = FAIL; +hid_t H5T_NATIVE_UINT_FAST32_g = FAIL; + +hid_t H5T_NATIVE_INT64_g = FAIL; +hid_t H5T_NATIVE_UINT64_g = FAIL; +hid_t H5T_NATIVE_INT_LEAST64_g = FAIL; +hid_t H5T_NATIVE_UINT_LEAST64_g = FAIL; +hid_t H5T_NATIVE_INT_FAST64_g = FAIL; +hid_t H5T_NATIVE_UINT_FAST64_g = FAIL; /* * Alignment constraints for native types. These are initialized at run time @@ -145,33 +149,33 @@ size_t H5T_NATIVE_LDOUBLE_ALIGN_g = 0; * H5Tinit.c if the types are provided by the system. Otherwise we set their * values to 0 here (no alignment calculated). */ -size_t H5T_NATIVE_INT8_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT8_T_ALIGN_g = 0; -size_t H5T_NATIVE_INT_LEAST8_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT_LEAST8_T_ALIGN_g = 0; -size_t H5T_NATIVE_INT_FAST8_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT_FAST8_T_ALIGN_g = 0; - -size_t H5T_NATIVE_INT16_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT16_T_ALIGN_g = 0; -size_t H5T_NATIVE_INT_LEAST16_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT_LEAST16_T_ALIGN_g= 0; -size_t H5T_NATIVE_INT_FAST16_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT_FAST16_T_ALIGN_g = 0; - -size_t H5T_NATIVE_INT32_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT32_T_ALIGN_g = 0; -size_t H5T_NATIVE_INT_LEAST32_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT_LEAST32_T_ALIGN_g= 0; -size_t H5T_NATIVE_INT_FAST32_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT_FAST32_T_ALIGN_g = 0; - -size_t H5T_NATIVE_INT64_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT64_T_ALIGN_g = 0; -size_t H5T_NATIVE_INT_LEAST64_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT_LEAST64_T_ALIGN_g= 0; -size_t H5T_NATIVE_INT_FAST64_T_ALIGN_g = 0; -size_t H5T_NATIVE_UINT_FAST64_T_ALIGN_g = 0; +size_t H5T_NATIVE_INT8_ALIGN_g = 0; +size_t H5T_NATIVE_UINT8_ALIGN_g = 0; +size_t H5T_NATIVE_INT_LEAST8_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_LEAST8_ALIGN_g = 0; +size_t H5T_NATIVE_INT_FAST8_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_FAST8_ALIGN_g = 0; + +size_t H5T_NATIVE_INT16_ALIGN_g = 0; +size_t H5T_NATIVE_UINT16_ALIGN_g = 0; +size_t H5T_NATIVE_INT_LEAST16_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_LEAST16_ALIGN_g = 0; +size_t H5T_NATIVE_INT_FAST16_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_FAST16_ALIGN_g = 0; + +size_t H5T_NATIVE_INT32_ALIGN_g = 0; +size_t H5T_NATIVE_UINT32_ALIGN_g = 0; +size_t H5T_NATIVE_INT_LEAST32_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_LEAST32_ALIGN_g = 0; +size_t H5T_NATIVE_INT_FAST32_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_FAST32_ALIGN_g = 0; + +size_t H5T_NATIVE_INT64_ALIGN_g = 0; +size_t H5T_NATIVE_UINT64_ALIGN_g = 0; +size_t H5T_NATIVE_INT_LEAST64_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_LEAST64_ALIGN_g = 0; +size_t H5T_NATIVE_INT_FAST64_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_FAST64_ALIGN_g = 0; /* @@ -266,152 +270,152 @@ H5T_init_interface(void) */ /* int8 */ - if (H5T_NATIVE_INT8_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT8_T_g = H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT8_g<0) { + dt = H5I_object(H5T_NATIVE_INT8_g = H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 1; dt->u.atomic.prec = 8; } - if (H5T_NATIVE_UINT8_T_g<0) { - dt = H5I_object(H5T_NATIVE_UINT8_T_g = H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT8_g<0) { + dt = H5I_object(H5T_NATIVE_UINT8_g = H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 1; dt->u.atomic.prec = 8; } - if (H5T_NATIVE_INT_LEAST8_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT_LEAST8_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT_LEAST8_g<0) { + dt = H5I_object(H5T_NATIVE_INT_LEAST8_g=H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 1; dt->u.atomic.prec = 8; } - if (H5T_NATIVE_UINT_LEAST8_T_g<0) { - dt = H5I_object(H5T_NATIVE_UINT_LEAST8_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT_LEAST8_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_LEAST8_g=H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 1; dt->u.atomic.prec = 8; } - if (H5T_NATIVE_INT_FAST8_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT_FAST8_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT_FAST8_g<0) { + dt = H5I_object(H5T_NATIVE_INT_FAST8_g=H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 1; dt->u.atomic.prec = 8; } - if (H5T_NATIVE_UINT_FAST8_T_g<0) { - dt = H5I_object(H5T_NATIVE_UINT_FAST8_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT_FAST8_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_FAST8_g=H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 1; dt->u.atomic.prec = 8; } /* int16 */ - if (H5T_NATIVE_INT16_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT16_T_g = H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT16_g<0) { + dt = H5I_object(H5T_NATIVE_INT16_g = H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 2; dt->u.atomic.prec = 16; } - if (H5T_NATIVE_UINT16_T_g<0) { - dt = H5I_object(H5T_NATIVE_UINT16_T_g = H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT16_g<0) { + dt = H5I_object(H5T_NATIVE_UINT16_g = H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 2; dt->u.atomic.prec = 16; } - if (H5T_NATIVE_INT_LEAST16_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT_LEAST16_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT_LEAST16_g<0) { + dt = H5I_object(H5T_NATIVE_INT_LEAST16_g=H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 2; dt->u.atomic.prec = 16; } - if (H5T_NATIVE_UINT_LEAST16_T_g<0) { - dt=H5I_object(H5T_NATIVE_UINT_LEAST16_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT_LEAST16_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_LEAST16_g=H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 2; dt->u.atomic.prec = 16; } - if (H5T_NATIVE_INT_FAST16_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT_FAST16_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT_FAST16_g<0) { + dt = H5I_object(H5T_NATIVE_INT_FAST16_g=H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 2; dt->u.atomic.prec = 16; } - if (H5T_NATIVE_UINT_FAST16_T_g<0) { - dt = H5I_object(H5T_NATIVE_UINT_FAST16_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT_FAST16_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_FAST16_g=H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 2; dt->u.atomic.prec = 16; } /* int32 */ - if (H5T_NATIVE_INT32_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT32_T_g = H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT32_g<0) { + dt = H5I_object(H5T_NATIVE_INT32_g = H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 4; dt->u.atomic.prec = 32; } - if (H5T_NATIVE_UINT32_T_g<0) { - dt = H5I_object(H5T_NATIVE_UINT32_T_g = H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT32_g<0) { + dt = H5I_object(H5T_NATIVE_UINT32_g = H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 4; dt->u.atomic.prec = 32; } - if (H5T_NATIVE_INT_LEAST32_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT_LEAST32_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT_LEAST32_g<0) { + dt = H5I_object(H5T_NATIVE_INT_LEAST32_g=H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 4; dt->u.atomic.prec = 32; } - if (H5T_NATIVE_UINT_LEAST32_T_g<0) { - dt=H5I_object(H5T_NATIVE_UINT_LEAST32_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT_LEAST32_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_LEAST32_g=H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 4; dt->u.atomic.prec = 32; } - if (H5T_NATIVE_INT_FAST32_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT_FAST32_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT_FAST32_g<0) { + dt = H5I_object(H5T_NATIVE_INT_FAST32_g=H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 4; dt->u.atomic.prec = 32; } - if (H5T_NATIVE_UINT_FAST32_T_g<0) { - dt = H5I_object(H5T_NATIVE_UINT_FAST32_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT_FAST32_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_FAST32_g=H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 4; dt->u.atomic.prec = 32; } /* int64 */ - if (H5T_NATIVE_INT64_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT64_T_g = H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT64_g<0) { + dt = H5I_object(H5T_NATIVE_INT64_g = H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 8; dt->u.atomic.prec = 64; } - if (H5T_NATIVE_UINT64_T_g<0) { - dt = H5I_object(H5T_NATIVE_UINT64_T_g = H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT64_g<0) { + dt = H5I_object(H5T_NATIVE_UINT64_g = H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 8; dt->u.atomic.prec = 64; } - if (H5T_NATIVE_INT_LEAST64_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT_LEAST64_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT_LEAST64_g<0) { + dt = H5I_object(H5T_NATIVE_INT_LEAST64_g=H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 8; dt->u.atomic.prec = 64; } - if (H5T_NATIVE_UINT_LEAST64_T_g<0) { - dt=H5I_object(H5T_NATIVE_UINT_LEAST64_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT_LEAST64_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_LEAST64_g=H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 8; dt->u.atomic.prec = 64; } - if (H5T_NATIVE_INT_FAST64_T_g<0) { - dt = H5I_object(H5T_NATIVE_INT_FAST64_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + if (H5T_NATIVE_INT_FAST64_g<0) { + dt = H5I_object(H5T_NATIVE_INT_FAST64_g=H5Tcopy(H5T_NATIVE_INT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 8; dt->u.atomic.prec = 64; } - if (H5T_NATIVE_UINT_FAST64_T_g<0) { - dt = H5I_object(H5T_NATIVE_UINT_FAST64_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + if (H5T_NATIVE_UINT_FAST64_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_FAST64_g=H5Tcopy(H5T_NATIVE_UINT_g)); dt->state = H5T_STATE_IMMUTABLE; dt->size = 8; dt->u.atomic.prec = 64; -- cgit v0.12