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

[svn-r952] Changes since 19981125

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

./doc/html/Datatypes.html
./src/H5.c
./src/H5T.c
./src/H5Tconv.c
./src/H5Tpkg.h
./src/H5Tpublic.h
./src/H5detect.c
./test/chunk.c
./test/dtypes.c
./test/h5test.c
./test/mtime.c
./test/tattr.c
./test/th5s.c
./tools/h5dump.c
./tools/h5dumputil.c
./tools/h5import.c
./tools/h5ls.c
./tools/h5toh4.c
./tools/h5tools.c
	Renamed the old H5T_NATIVE_CHAR type to H5T_NATIVE_SCHAR to
	denote that it is always signed.

	Added a new H5T_NATIVE_CHAR type which has the same range,
	representation, and behavior as either H5T_NATIVE_SCHAR or
	H5T_NATIVE_UCHAR depending on the compiler and its
	command-line switches for the application source file which
	references H5T_NATIVE_CHAR. If source files are compiled with
	different switches then each source file will resolve
	H5T_NATIVE_CHAR appropriately so it matches the C type `char'
	in that source file.

	NOTE: THERE ARE OTHER DOCUMENTATION FILES THAT I DIDN'T CHANGE
	BECAUSE I CAN'T MODIFY THE SOURCE.

./test/extend.c
	Swapped two lines to prevent diagnostic messages from messing
	up the formatted output.
This commit is contained in:
Robb Matzke 1998-11-25 12:21:21 -05:00
parent 37ce8f33ca
commit ffcbc32d66
22 changed files with 574 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/html/Datatypes.html
View File

@ -737,6 +737,10 @@
</tr>
<tr>
<td><code>H5T_NATIVE_CHAR</code></td>
<td><code>char</code></td>
</tr>
<tr>
<td><code>H5T_NATIVE_SCHAR</code></td>
<td><code>signed char</code></td>
</tr>
<tr>
@ -1425,9 +1429,7 @@ H5Tregister_soft ("cus2be", H5T_INTEGER, H5T_INTEGER, cray_ushort2be);
-->
<!-- Created: Thu Dec 4 14:57:32 EST 1997 -->
<!-- hhmts start -->
<!--
Last modified: Tue Sep 8 14:43:32 EDT 1998
-->
Last modified: Wed Nov 25 12:25:49 EST 1998
<!-- hhmts end -->
<hr>

264
src/.distdep
View File

@ -1,34 +1,3 @@
H5.o: \
H5.c \
H5private.h \
H5public.h \
H5config.h \
H5ACprivate.h \
H5ACpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Ipublic.h \
H5Dpublic.h \
H5Bprivate.h \
H5Bpublic.h \
H5Eprivate.h \
H5Epublic.h \
H5Iprivate.h \
H5MMprivate.h \
H5MMpublic.h \
H5Pprivate.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h
H5A.o: \
H5A.c \
H5private.h \
@ -837,32 +806,6 @@ H5Ostab.o: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h
H5P.o: \
H5P.c \
H5private.h \
H5public.h \
H5config.h \
H5Iprivate.h \
H5Ipublic.h \
H5Bprivate.h \
H5Bpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
H5Dprivate.h \
H5Gprivate.h \
H5Gpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Eprivate.h
H5R.o: \
H5R.c \
H5private.h \
@ -1097,37 +1040,6 @@ H5Sselect.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h
H5T.o: \
H5T.c \
H5private.h \
H5public.h \
H5config.h \
H5Dprivate.h \
H5Dpublic.h \
H5Ipublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Iprivate.h \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
H5MMpublic.h \
H5Tpkg.h \
H5Rprivate.h
H5Tbit.o: \
H5Tbit.c \
H5private.h \
@ -1149,50 +1061,6 @@ H5Tbit.o: \
H5Tpublic.h \
H5Gprivate.h \
H5Gpublic.h
H5Tconv.o: \
H5Tconv.c \
H5Iprivate.h \
H5Ipublic.h \
H5public.h \
H5config.h \
H5private.h \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
H5MMpublic.h \
H5Tpkg.h \
H5HGprivate.h \
H5HGpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
H5Rprivate.h \
H5Rpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Gprivate.h \
H5Gpublic.h
H5Tinit.o: \
H5Tinit.c \
H5private.h \
H5public.h \
H5config.h \
H5Iprivate.h \
H5Ipublic.h \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
H5MMpublic.h \
H5Tpkg.h \
H5HGprivate.h \
H5HGpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
H5Rprivate.h \
H5Rpublic.h \
H5Tprivate.h \
H5Tpublic.h
H5TB.o: \
H5TB.c \
H5private.h \
@ -1251,3 +1119,135 @@ H5Z.o: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h
H5.o: \
H5.c \
H5private.h \
H5public.h \
H5config.h \
H5ACprivate.h \
H5ACpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Ipublic.h \
H5Dpublic.h \
H5Bprivate.h \
H5Bpublic.h \
H5Eprivate.h \
H5Epublic.h \
H5Iprivate.h \
H5MMprivate.h \
H5MMpublic.h \
H5Pprivate.h \
H5Ppublic.h \
H5Zpublic.h \
H5Rpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h
H5P.o: \
H5P.c \
H5private.h \
H5public.h \
H5config.h \
H5Iprivate.h \
H5Ipublic.h \
H5Bprivate.h \
H5Bpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
H5Dprivate.h \
H5Gprivate.h \
H5Gpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Eprivate.h
H5T.o: \
H5T.c \
H5private.h \
H5public.h \
H5config.h \
H5Dprivate.h \
H5Dpublic.h \
H5Ipublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h \
H5Zpublic.h \
H5Iprivate.h \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
H5MMpublic.h \
H5Tpkg.h \
H5Rprivate.h
H5Tconv.o: \
H5Tconv.c \
H5Iprivate.h \
H5Ipublic.h \
H5public.h \
H5config.h \
H5private.h \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
H5MMpublic.h \
H5Tpkg.h \
H5HGprivate.h \
H5HGpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
H5Rprivate.h \
H5Rpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Gprivate.h \
H5Gpublic.h
H5Tinit.o: \
H5Tinit.c \
H5private.h \
H5public.h \
H5config.h \
H5Iprivate.h \
H5Ipublic.h \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
H5MMpublic.h \
H5Tpkg.h \
H5HGprivate.h \
H5HGpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
H5Rprivate.h \
H5Rpublic.h \
H5Tprivate.h \
H5Tpublic.h

4
src/H5.c
View File

@ -1532,8 +1532,8 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
}
break;
case H5I_DATATYPE:
if (obj==H5T_NATIVE_CHAR_g) {
fprintf(out, "H5T_NATIVE_CHAR");
if (obj==H5T_NATIVE_SCHAR_g) {
fprintf(out, "H5T_NATIVE_SCHAR");
} else if (obj==H5T_NATIVE_UCHAR_g) {
fprintf(out, "H5T_NATIVE_UCHAR");
} else if (obj==H5T_NATIVE_SHORT_g) {

74
src/H5T.c
View File

@ -70,7 +70,7 @@ hid_t H5T_C_S1_g = FAIL;
hid_t H5T_FORTRAN_S1_g = FAIL;
hid_t H5T_NATIVE_CHAR_g = FAIL;
hid_t H5T_NATIVE_SCHAR_g = FAIL;
hid_t H5T_NATIVE_UCHAR_g = FAIL;
hid_t H5T_NATIVE_SHORT_g = FAIL;
hid_t H5T_NATIVE_USHORT_g = FAIL;
@ -775,8 +775,8 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("llong_char", H5T_NATIVE_LLONG, H5T_NATIVE_CHAR,
H5T_conv_llong_char)<0) {
if (H5Tregister_hard("llong_schar", H5T_NATIVE_LLONG, H5T_NATIVE_SCHAR,
H5T_conv_llong_schar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -785,8 +785,8 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("ullong_char", H5T_NATIVE_ULLONG, H5T_NATIVE_CHAR,
H5T_conv_ullong_char)<0) {
if (H5Tregister_hard("ullong_schar", H5T_NATIVE_ULLONG, H5T_NATIVE_SCHAR,
H5T_conv_ullong_schar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -867,8 +867,8 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("long_char", H5T_NATIVE_LONG, H5T_NATIVE_CHAR,
H5T_conv_long_char)<0) {
if (H5Tregister_hard("long_schar", H5T_NATIVE_LONG, H5T_NATIVE_SCHAR,
H5T_conv_long_schar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -877,8 +877,8 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("ulong_char", H5T_NATIVE_ULONG, H5T_NATIVE_CHAR,
H5T_conv_ulong_char)<0) {
if (H5Tregister_hard("ulong_schar", H5T_NATIVE_ULONG, H5T_NATIVE_SCHAR,
H5T_conv_ulong_schar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -959,8 +959,8 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("short_char", H5T_NATIVE_SHORT, H5T_NATIVE_CHAR,
H5T_conv_short_char)<0) {
if (H5Tregister_hard("short_schar", H5T_NATIVE_SHORT, H5T_NATIVE_SCHAR,
H5T_conv_short_schar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -969,8 +969,8 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("ushort_char", H5T_NATIVE_USHORT, H5T_NATIVE_CHAR,
H5T_conv_ushort_char)<0) {
if (H5Tregister_hard("ushort_schar", H5T_NATIVE_USHORT, H5T_NATIVE_SCHAR,
H5T_conv_ushort_schar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -1051,8 +1051,8 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("int_char", H5T_NATIVE_INT, H5T_NATIVE_CHAR,
H5T_conv_int_char)<0) {
if (H5Tregister_hard("int_schar", H5T_NATIVE_INT, H5T_NATIVE_SCHAR,
H5T_conv_int_schar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -1061,8 +1061,8 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("uint_char", H5T_NATIVE_UINT, H5T_NATIVE_CHAR,
H5T_conv_uint_char)<0) {
if (H5Tregister_hard("uint_schar", H5T_NATIVE_UINT, H5T_NATIVE_SCHAR,
H5T_conv_uint_schar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -1073,13 +1073,13 @@ H5T_init_interface(void)
}
/* From char */
if (H5Tregister_hard("char_llong", H5T_NATIVE_CHAR, H5T_NATIVE_LLONG,
H5T_conv_char_llong)<0) {
if (H5Tregister_hard("schar_llong", H5T_NATIVE_SCHAR, H5T_NATIVE_LLONG,
H5T_conv_schar_llong)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("char_ullong", H5T_NATIVE_CHAR, H5T_NATIVE_ULLONG,
H5T_conv_char_ullong)<0) {
if (H5Tregister_hard("schar_ullong", H5T_NATIVE_SCHAR, H5T_NATIVE_ULLONG,
H5T_conv_schar_ullong)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -1093,13 +1093,13 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("char_long", H5T_NATIVE_CHAR, H5T_NATIVE_LONG,
H5T_conv_char_long)<0) {
if (H5Tregister_hard("schar_long", H5T_NATIVE_SCHAR, H5T_NATIVE_LONG,
H5T_conv_schar_long)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("char_ulong", H5T_NATIVE_CHAR, H5T_NATIVE_ULONG,
H5T_conv_char_ulong)<0) {
if (H5Tregister_hard("schar_ulong", H5T_NATIVE_SCHAR, H5T_NATIVE_ULONG,
H5T_conv_schar_ulong)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -1113,13 +1113,13 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("char_short", H5T_NATIVE_CHAR, H5T_NATIVE_SHORT,
H5T_conv_char_short)<0) {
if (H5Tregister_hard("schar_short", H5T_NATIVE_SCHAR, H5T_NATIVE_SHORT,
H5T_conv_schar_short)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("char_ushort", H5T_NATIVE_CHAR, H5T_NATIVE_USHORT,
H5T_conv_char_ushort)<0) {
if (H5Tregister_hard("schar_ushort", H5T_NATIVE_SCHAR, H5T_NATIVE_USHORT,
H5T_conv_schar_ushort)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -1133,13 +1133,13 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("char_int", H5T_NATIVE_CHAR, H5T_NATIVE_INT,
H5T_conv_char_int)<0) {
if (H5Tregister_hard("schar_int", H5T_NATIVE_SCHAR, H5T_NATIVE_INT,
H5T_conv_schar_int)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("char_uint", H5T_NATIVE_CHAR, H5T_NATIVE_UINT,
H5T_conv_char_uint)<0) {
if (H5Tregister_hard("schar_uint", H5T_NATIVE_SCHAR, H5T_NATIVE_UINT,
H5T_conv_schar_uint)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
@ -1153,13 +1153,13 @@ H5T_init_interface(void)
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("char_uchar", H5T_NATIVE_CHAR, H5T_NATIVE_UCHAR,
H5T_conv_char_uchar)<0) {
if (H5Tregister_hard("schar_uchar", H5T_NATIVE_SCHAR, H5T_NATIVE_UCHAR,
H5T_conv_schar_uchar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}
if (H5Tregister_hard("uchar_char", H5T_NATIVE_UCHAR, H5T_NATIVE_CHAR,
H5T_conv_uchar_char)<0) {
if (H5Tregister_hard("uchar_schar", H5T_NATIVE_UCHAR, H5T_NATIVE_SCHAR,
H5T_conv_uchar_schar)<0) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
"unable to register conversion function");
}

152
src/H5Tconv.c
View File

@ -1975,7 +1975,7 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
/*-------------------------------------------------------------------------
* Function: H5T_conv_char_uchar
* Function: H5T_conv_schar_uchar
*
* Purpose: Converts `signed char' to `unsigned char'
*
@ -1991,10 +1991,10 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
*-------------------------------------------------------------------------
*/
herr_t
H5T_conv_char_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void __unused__ *bkg)
H5T_conv_schar_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_char_uchar, FAIL);
FUNC_ENTER(H5T_conv_schar_uchar, FAIL);
H5T_CONV_su(cdata, src_id, dst_id, buf, nelmts,
signed char, unsigned char);
FUNC_LEAVE(SUCCEED);
@ -2002,7 +2002,7 @@ H5T_conv_char_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
/*-------------------------------------------------------------------------
* Function: H5T_conv_uchar_char
* Function: H5T_conv_uchar_schar
*
* Purpose: Converts `unsigned char' to `signed char'
*
@ -2018,10 +2018,10 @@ H5T_conv_char_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*-------------------------------------------------------------------------
*/
herr_t
H5T_conv_uchar_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void __unused__ *bkg)
H5T_conv_uchar_schar(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_short, FAIL);
FUNC_ENTER(H5T_conv_uchar_schar, FAIL);
H5T_CONV_us(cdata, src_id, dst_id, buf, nelmts,
unsigned char, signed char, SCHAR_MAX);
FUNC_LEAVE(SUCCEED);
@ -2029,7 +2029,7 @@ H5T_conv_uchar_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
/*-------------------------------------------------------------------------
* Function: H5T_conv_char_short
* Function: H5T_conv_schar_short
*
* Purpose: Converts `signed char' to `short'
*
@ -2045,18 +2045,18 @@ H5T_conv_uchar_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_schar_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);
FUNC_ENTER(H5T_conv_schar_short, FAIL);
H5T_CONV_sS(cdata, buf, nelmts, signed char, short);
FUNC_LEAVE(SUCCEED);
}
/*-------------------------------------------------------------------------
* Function: H5T_conv_char_ushort
* Function: H5T_conv_schar_ushort
*
* Purpose: Converts `signed char' to `unsigned short'
*
@ -2072,10 +2072,10 @@ H5T_conv_char_short(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_schar_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);
FUNC_ENTER(H5T_conv_schar_ushort, FAIL);
H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts,
signed char, unsigned short);
FUNC_LEAVE(SUCCEED);
@ -2137,7 +2137,7 @@ H5T_conv_uchar_ushort(hid_t __unused__ src_id, hid_t __unused__ dst_id,
/*-------------------------------------------------------------------------
* Function: H5T_conv_char_int
* Function: H5T_conv_schar_int
*
* Purpose: Converts `signed char' to `int'
*
@ -2153,18 +2153,18 @@ H5T_conv_uchar_ushort(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_schar_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);
FUNC_ENTER(H5T_conv_schar_int, FAIL);
H5T_CONV_sS(cdata, buf, nelmts, signed char, int);
FUNC_LEAVE(SUCCEED);
}
/*-------------------------------------------------------------------------
* Function: H5T_conv_char_uint
* Function: H5T_conv_schar_uint
*
* Purpose: Converts `signed char' to `unsigned int'
*
@ -2180,10 +2180,10 @@ H5T_conv_char_int(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_schar_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);
FUNC_ENTER(H5T_conv_schar_uint, FAIL);
H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts, signed char, unsigned);
FUNC_LEAVE(SUCCEED);
}
@ -2244,7 +2244,7 @@ H5T_conv_uchar_uint(hid_t __unused__ src_id, hid_t __unused__ dst_id,
/*-------------------------------------------------------------------------
* Function: H5T_conv_char_long
* Function: H5T_conv_schar_long
*
* Purpose: Converts `signed char' to `long'
*
@ -2260,18 +2260,18 @@ H5T_conv_uchar_uint(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_schar_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);
FUNC_ENTER(H5T_conv_schar_long, FAIL);
H5T_CONV_sS(cdata, buf, nelmts, signed char, long);
FUNC_LEAVE(SUCCEED);
}
/*-------------------------------------------------------------------------
* Function: H5T_conv_char_ulong
* Function: H5T_conv_schar_ulong
*
* Purpose: Converts `signed char' to `unsigned long'
*
@ -2287,10 +2287,10 @@ H5T_conv_char_long(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_schar_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);
FUNC_ENTER(H5T_conv_schar_ulong, FAIL);
H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts,
signed char, unsigned long);
FUNC_LEAVE(SUCCEED);
@ -2352,7 +2352,7 @@ H5T_conv_uchar_ulong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
/*-------------------------------------------------------------------------
* Function: H5T_conv_char_llong
* Function: H5T_conv_schar_llong
*
* Purpose: Converts `signed char' to `long_long'
*
@ -2368,18 +2368,18 @@ H5T_conv_uchar_ulong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
herr_t
H5T_conv_char_llong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
H5T_cdata_t *cdata, size_t nelmts, void *buf,
void __unused__ *bkg)
H5T_conv_schar_llong(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_llong, FAIL);
FUNC_ENTER(H5T_conv_schar_llong, FAIL);
H5T_CONV_sS(cdata, buf, nelmts, signed char, long_long);
FUNC_LEAVE(SUCCEED);
}
/*-------------------------------------------------------------------------
* Function: H5T_conv_char_ullong
* Function: H5T_conv_schar_ullong
*
* Purpose: Converts `signed char' to `unsigned long_long'
*
@ -2395,10 +2395,10 @@ H5T_conv_char_llong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
herr_t
H5T_conv_char_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void __unused__ *bkg)
H5T_conv_schar_ullong(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_ullong, FAIL);
FUNC_ENTER(H5T_conv_schar_ullong, FAIL);
H5T_CONV_sU(cdata, src_id, dst_id, buf, nelmts,
signed char, unsigned long_long);
FUNC_LEAVE(SUCCEED);
@ -2460,7 +2460,7 @@ H5T_conv_uchar_ullong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
/*-------------------------------------------------------------------------
* Function: H5T_conv_short_char
* Function: H5T_conv_short_schar
*
* Purpose: Converts `short' to `signed char'
*
@ -2476,10 +2476,10 @@ H5T_conv_uchar_ullong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_short_schar(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);
FUNC_ENTER(H5T_conv_short_schar, FAIL);
H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts,
short, signed char, SCHAR_MIN, SCHAR_MAX);
FUNC_LEAVE(SUCCEED);
@ -2514,7 +2514,7 @@ H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
/*-------------------------------------------------------------------------
* Function: H5T_conv_ushort_char
* Function: H5T_conv_ushort_schar
*
* Purpose: Converts `unsigned short' to `signed char'
*
@ -2530,10 +2530,10 @@ H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_ushort_schar(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);
FUNC_ENTER(H5T_conv_ushort_schar, FAIL);
H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts,
unsigned short, signed char, SCHAR_MAX);
FUNC_LEAVE(SUCCEED);
@ -2944,7 +2944,7 @@ H5T_conv_ushort_ullong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
/*-------------------------------------------------------------------------
* Function: H5T_conv_int_char
* Function: H5T_conv_int_schar
*
* Purpose: Converts `int' to `signed char'
*
@ -2960,10 +2960,10 @@ H5T_conv_ushort_ullong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_int_schar(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);
FUNC_ENTER(H5T_conv_int_schar, FAIL);
H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts,
int, signed char, SCHAR_MIN, SCHAR_MAX);
FUNC_LEAVE(SUCCEED);
@ -2998,7 +2998,7 @@ H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
/*-------------------------------------------------------------------------
* Function: H5T_conv_uint_char
* Function: H5T_conv_uint_schar
*
* Purpose: Converts `unsigned int' to `signed char'
*
@ -3014,10 +3014,10 @@ H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_uint_schar(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);
FUNC_ENTER(H5T_conv_uint_schar, FAIL);
H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts,
unsigned, signed char, SCHAR_MAX);
FUNC_LEAVE(SUCCEED);
@ -3429,7 +3429,7 @@ H5T_conv_uint_ullong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
/*-------------------------------------------------------------------------
* Function: H5T_conv_long_char
* Function: H5T_conv_long_schar
*
* Purpose: Converts `long' to `signed char'
*
@ -3445,10 +3445,10 @@ H5T_conv_uint_ullong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_long_schar(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);
FUNC_ENTER(H5T_conv_long_schar, FAIL);
H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts,
long, signed char, SCHAR_MIN, SCHAR_MAX);
FUNC_LEAVE(SUCCEED);
@ -3483,7 +3483,7 @@ H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
/*-------------------------------------------------------------------------
* Function: H5T_conv_ulong_char
* Function: H5T_conv_ulong_schar
*
* Purpose: Converts `unsigned long' to `signed char'
*
@ -3499,10 +3499,10 @@ H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*-------------------------------------------------------------------------
*/
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)
H5T_conv_ulong_schar(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);
FUNC_ENTER(H5T_conv_ulong_schar, FAIL);
H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts,
unsigned long, signed char, SCHAR_MAX);
FUNC_LEAVE(SUCCEED);
@ -3915,7 +3915,7 @@ H5T_conv_ulong_ullong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_char
* Function: H5T_conv_llong_schar
*
* Purpose: Converts `long_long' to `signed char'
*
@ -3931,10 +3931,10 @@ H5T_conv_ulong_ullong(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*-------------------------------------------------------------------------
*/
herr_t
H5T_conv_llong_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void __unused__ *bkg)
H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void __unused__ *bkg)
{
FUNC_ENTER(H5T_conv_llong_char, FAIL);
FUNC_ENTER(H5T_conv_llong_schar, FAIL);
H5T_CONV_Ss(cdata, src_id, dst_id, buf, nelmts,
long_long, signed char, SCHAR_MIN, SCHAR_MAX);
FUNC_LEAVE(SUCCEED);
@ -3969,7 +3969,7 @@ H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_char
* Function: H5T_conv_ullong_schar
*
* Purpose: Converts `unsigned long_long' to `signed char'
*
@ -3985,10 +3985,10 @@ H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*-------------------------------------------------------------------------
*/
herr_t
H5T_conv_ullong_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void __unused__ *bkg)
H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void __unused__ *bkg)
{
FUNC_ENTER(H5T_conv_ullong_char, FAIL);
FUNC_ENTER(H5T_conv_ullong_schar, FAIL);
H5T_CONV_Us(cdata, src_id, dst_id, buf, nelmts,
unsigned long_long, signed char, SCHAR_MAX);
FUNC_LEAVE(SUCCEED);

64
src/H5Tpkg.h
View File

@ -142,49 +142,49 @@ herr_t H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
herr_t H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *_buf, void *bkg);
herr_t H5T_conv_char_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_uchar_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
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,
herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_schar_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,
herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_schar_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,
herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_schar_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_char_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_char_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_uchar_ullong(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_schar(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_schar(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_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
@ -216,12 +216,12 @@ herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
herr_t H5T_conv_ushort_ullong(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_schar(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_schar(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,
@ -253,12 +253,12 @@ herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
herr_t H5T_conv_uint_ullong(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_schar(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_schar(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,
@ -290,12 +290,12 @@ herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_llong_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_ullong_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *buf, void *bkg);
herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,

5
src/H5Tpublic.h
View File

@ -329,7 +329,8 @@ extern hid_t H5T_FORTRAN_S1_g;
* to C's `long_long' and LDOUBLE is `long double' (these types might be the
* same as `LONG' and `DOUBLE' respectively.
*/
#define H5T_NATIVE_CHAR (H5open(), H5T_NATIVE_CHAR_g)
#define H5T_NATIVE_CHAR (CHAR_MIN?H5T_NATIVE_SCHAR:H5T_NATIVE_UCHAR)
#define H5T_NATIVE_SCHAR (H5open(), H5T_NATIVE_SCHAR_g)
#define H5T_NATIVE_UCHAR (H5open(), H5T_NATIVE_UCHAR_g)
#define H5T_NATIVE_SHORT (H5open(), H5T_NATIVE_SHORT_g)
#define H5T_NATIVE_USHORT (H5open(), H5T_NATIVE_USHORT_g)
@ -351,7 +352,7 @@ extern hid_t H5T_FORTRAN_S1_g;
#define H5T_NATIVE_HSSIZE (H5open(), H5T_NATIVE_HSSIZE_g)
#define H5T_NATIVE_HERR (H5open(), H5T_NATIVE_HERR_g)
#define H5T_NATIVE_HBOOL (H5open(), H5T_NATIVE_HBOOL_g)
extern hid_t H5T_NATIVE_CHAR_g;
extern hid_t H5T_NATIVE_SCHAR_g;
extern hid_t H5T_NATIVE_UCHAR_g;
extern hid_t H5T_NATIVE_SHORT_g;
extern hid_t H5T_NATIVE_USHORT_g;

2
src/H5detect.c
View File

@ -934,7 +934,7 @@ main(void)
print_header();
DETECT_I(signed char, CHAR, d[nd]); nd++;
DETECT_I(signed char, SCHAR, d[nd]); nd++;
DETECT_I(unsigned char, UCHAR, d[nd]); nd++;
DETECT_I(short, SHORT, d[nd]); nd++;
DETECT_I(unsigned short, USHORT, d[nd]); nd++;

418
test/.distdep
View File

@ -1,35 +1,3 @@
h5test.o: \
h5test.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
big.o: \
big.c \
h5test.h \
@ -94,30 +62,6 @@ bittests.o: \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
chunk.o: \
chunk.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
cmpd_dset.o: \
cmpd_dset.c \
h5test.h \
@ -182,70 +126,6 @@ dsets.o: \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
dtypes.o: \
dtypes.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
extend.o: \
extend.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
external.o: \
external.c \
h5test.h \
@ -572,38 +452,6 @@ mount.o: \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
mtime.o: \
mtime.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
ohdr.o: \
ohdr.c \
h5test.h \
@ -745,36 +593,6 @@ stab.o: \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
tattr.o: \
tattr.c \
testhdf5.h \
../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Eprivate.h \
../src/H5Epublic.h \
../src/H5Ipublic.h \
../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h
testhdf5.o: \
testhdf5.c \
testhdf5.h \
../src/H5private.h \
../src/H5public.h \
../src/H5config.h
tfile.o: \
tfile.c \
testhdf5.h \
@ -790,33 +608,6 @@ tfile.o: \
../src/H5Fpublic.h \
../src/H5Dpublic.h \
../src/H5Pprivate.h
th5s.o: \
th5s.c \
testhdf5.h \
../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Eprivate.h \
../src/H5Epublic.h \
../src/H5Ipublic.h \
../src/H5Bprivate.h \
../src/H5Bpublic.h \
../src/H5Fprivate.h \
../src/H5Fpublic.h \
../src/H5Dpublic.h \
../src/H5Sprivate.h \
../src/H5Spublic.h \
../src/H5Gprivate.h \
../src/H5Gpublic.h \
../src/H5Oprivate.h \
../src/H5Opublic.h \
../src/H5HGprivate.h \
../src/H5HGpublic.h \
../src/H5Tprivate.h \
../src/H5Tpublic.h \
../src/H5Zprivate.h \
../src/H5Zpublic.h \
../src/H5Pprivate.h
tmeta.o: \
tmeta.c \
testhdf5.h \
@ -906,3 +697,212 @@ unlink.o: \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
h5test.o: \
h5test.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
chunk.o: \
chunk.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
dtypes.o: \
dtypes.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
extend.o: \
extend.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
mtime.o: \
mtime.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h
tattr.o: \
tattr.c \
testhdf5.h \
../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Eprivate.h \
../src/H5Epublic.h \
../src/H5Ipublic.h \
../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h
testhdf5.o: \
testhdf5.c \
testhdf5.h \
../src/H5private.h \
../src/H5public.h \
../src/H5config.h
th5s.o: \
th5s.c \
testhdf5.h \
../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Eprivate.h \
../src/H5Epublic.h \
../src/H5Ipublic.h \
../src/H5Bprivate.h \
../src/H5Bpublic.h \
../src/H5Fprivate.h \
../src/H5Fpublic.h \
../src/H5Dpublic.h \
../src/H5Sprivate.h \
../src/H5Spublic.h \
../src/H5Gprivate.h \
../src/H5Gpublic.h \
../src/H5Oprivate.h \
../src/H5Opublic.h \
../src/H5HGprivate.h \
../src/H5HGpublic.h \
../src/H5Tprivate.h \
../src/H5Tpublic.h \
../src/H5Zprivate.h \
../src/H5Zpublic.h \
../src/H5Pprivate.h

18
test/chunk.c
View File

@ -113,7 +113,7 @@ create_dataset (void)
{
hid_t file, space, dcpl, dset;
hsize_t size[2];
char *buf;
signed char *buf;
/* The file */
file = H5Fcreate (FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_g);
@ -130,12 +130,12 @@ create_dataset (void)
H5Pset_filter (dcpl, FILTER_COUNTER, 0, 0, NULL);
/* The dataset */
dset = H5Dcreate (file, "dset", H5T_NATIVE_CHAR, space, dcpl);
dset = H5Dcreate (file, "dset", H5T_NATIVE_SCHAR, space, dcpl);
assert (dset>=0);
/* The data */
buf = calloc (1, SQUARE (DS_SIZE*CH_SIZE));
H5Dwrite (dset, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
H5Dwrite (dset, H5T_NATIVE_SCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
free (buf);
/* Close */
@ -165,7 +165,7 @@ static double
test_rowmaj (int op, hsize_t cache_size, hsize_t io_size)
{
hid_t file, dset, mem_space, file_space;
char *buf = calloc (1, SQUARE(io_size));
signed char *buf = calloc (1, SQUARE(io_size));
hsize_t i, j, hs_size[2];
hssize_t hs_offset[2];
int mdc_nelmts, rdcc_nelmts;
@ -200,10 +200,10 @@ test_rowmaj (int op, hsize_t cache_size, hsize_t io_size)
NULL, hs_size, NULL);
if (READ==op) {
H5Dread (dset, H5T_NATIVE_CHAR, mem_space, file_space,
H5Dread (dset, H5T_NATIVE_SCHAR, mem_space, file_space,
H5P_DEFAULT, buf);
} else {
H5Dwrite (dset, H5T_NATIVE_CHAR, mem_space, file_space,
H5Dwrite (dset, H5T_NATIVE_SCHAR, mem_space, file_space,
H5P_DEFAULT, buf);
}
H5Sclose (mem_space);
@ -243,7 +243,7 @@ test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset)
hsize_t i, hs_size[2];
hsize_t nio = 0;
hssize_t hs_offset[2];
char *buf = calloc (1, SQUARE (io_size));
signed char *buf = calloc (1, SQUARE (io_size));
int mdc_nelmts, rdcc_nelmts;
double w0;
@ -268,10 +268,10 @@ test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset)
H5Sselect_hyperslab (file_space, H5S_SELECT_SET, hs_offset, NULL,
hs_size, NULL);
if (READ==op) {
H5Dread (dset, H5T_NATIVE_CHAR, mem_space, file_space,
H5Dread (dset, H5T_NATIVE_SCHAR, mem_space, file_space,
H5P_DEFAULT, buf);
} else {
H5Dwrite (dset, H5T_NATIVE_CHAR, mem_space, file_space,
H5Dwrite (dset, H5T_NATIVE_SCHAR, mem_space, file_space,
H5P_DEFAULT, buf);
}
H5Sclose (mem_space);

54
test/dtypes.c
View File

@ -189,15 +189,16 @@ generates_sigfpe(void)
while (pid!=waitpid(pid, &status, 0)) /*void*/;
if (WIFEXITED(status) && 0==WEXITSTATUS(status)) {
printf("Overflow cases will be tested.\n");
puts("Floating-point overflow cases will be tested.");
skip_overflow_tests_g = FALSE;
} else if (WIFSIGNALED(status) && SIGFPE==WTERMSIG(status)) {
printf("Overflow cases cannot be safely tested.\n");
puts("Floating-point overflow cases cannot be safely tested.");
skip_overflow_tests_g = TRUE;
}
#else
printf("Cannot determine if overflows generate a SIGFPE; assuming yes.\n");
printf("Overflow cases will not be tested.\n");
puts("Cannot determine if floating-point overflows generate a SIGFPE;");
puts("assuming yes.");
puts("Overflow cases will not be tested.");
skip_overflow_tests_g = TRUE;
#endif
}
@ -301,7 +302,7 @@ test_copy(void)
/* We should not be able to close a built-in byte */
H5E_BEGIN_TRY {
status = H5Tclose (H5T_NATIVE_CHAR);
status = H5Tclose (H5T_NATIVE_SCHAR);
} H5E_END_TRY;
if (status>=0) {
FAILED();
@ -1133,10 +1134,11 @@ test_conv_int (void)
* Purpose: Test conversion of random integer values from SRC to DST.
* These types should be any combination of:
*
* H5T_NATIVE_CHAR H5T_NATIVE_UCHAR
* H5T_NATIVE_SCHAR H5T_NATIVE_UCHAR
* H5T_NATIVE_SHORT H5T_NATIVE_USHORT
* H5T_NATIVE_INT H5T_NATIVE_UINT
* H5T_NATIVE_LONG H5T_NATIVE_ULONG
* H5T_NATIVE_LLONG H5T_NATIVE_ULLONG
*
* Return: Success: 0
*
@ -1184,7 +1186,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
/* What are the names of the source and destination types */
if (H5Tequal(src, H5T_NATIVE_CHAR)) {
if (H5Tequal(src, H5T_NATIVE_SCHAR)) {
src_type_name = "signed char";
src_type = INT_CHAR;
} else if (H5Tequal(src, H5T_NATIVE_UCHAR)) {
@ -1219,7 +1221,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
src_type = INT_OTHER;
}
if (H5Tequal(dst, H5T_NATIVE_CHAR)) {
if (H5Tequal(dst, H5T_NATIVE_SCHAR)) {
dst_type_name = "signed char";
dst_type = INT_CHAR;
} else if (H5Tequal(dst, H5T_NATIVE_UCHAR)) {
@ -2417,21 +2419,21 @@ run_integer_tests(const char *name)
{
int nerrors = 0;
nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_USHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_INT);
nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_UINT);
nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_USHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_INT);
nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_UINT);
#if SIZEOF_LONG!=SIZEOF_INT
nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_LONG);
nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_ULONG);
nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_LONG);
nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_ULONG);
#endif
#if SIZEOF_LONG_LONG!=SIZEOF_LONG
nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_LLONG);
nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_ULLONG);
nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_LLONG);
nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_ULLONG);
#endif
nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_CHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_USHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_INT);
@ -2445,7 +2447,7 @@ run_integer_tests(const char *name)
nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_ULLONG);
#endif
nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_CHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_USHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_INT);
@ -2459,7 +2461,7 @@ run_integer_tests(const char *name)
nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_ULLONG);
#endif
nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_CHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_INT);
@ -2473,7 +2475,7 @@ run_integer_tests(const char *name)
nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_ULLONG);
#endif
nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_CHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_USHORT);
@ -2487,7 +2489,7 @@ run_integer_tests(const char *name)
nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_ULLONG);
#endif
nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_CHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_USHORT);
@ -2502,7 +2504,7 @@ run_integer_tests(const char *name)
#endif
#if SIZEOF_LONG!=SIZEOF_INT
nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_CHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_USHORT);
@ -2516,7 +2518,7 @@ run_integer_tests(const char *name)
#endif
#if SIZEOF_LONG!=SIZEOF_INT
nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_CHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_USHORT);
@ -2530,7 +2532,7 @@ run_integer_tests(const char *name)
#endif
#if SIZEOF_LONG_LONG!=SIZEOF_LONG
nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_CHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_USHORT);
@ -2544,7 +2546,7 @@ run_integer_tests(const char *name)
#endif
#if SIZEOF_LONG_LONG!=SIZEOF_LONG
nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_CHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_SCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_UCHAR);
nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_SHORT);
nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_USHORT);

2
test/extend.c
View File

@ -50,9 +50,9 @@ main (void)
hssize_t offset[2];
char filename[1024];
TESTING("dataset extend");
h5_reset();
fapl = h5_fileaccess();
TESTING("dataset extend");
/* Initialize buffer and space */
for (i=0; i<NX; i++) {

36
test/h5test.c
View File

@ -317,17 +317,17 @@ h5_fileaccess(void)
void
h5_no_hwconv(void)
{
H5Tunregister(H5T_conv_char_uchar);
H5Tunregister(H5T_conv_char_short);
H5Tunregister(H5T_conv_char_ushort);
H5Tunregister(H5T_conv_char_int);
H5Tunregister(H5T_conv_char_uint);
H5Tunregister(H5T_conv_char_long);
H5Tunregister(H5T_conv_char_ulong);
H5Tunregister(H5T_conv_char_llong);
H5Tunregister(H5T_conv_char_ullong);
H5Tunregister(H5T_conv_schar_uchar);
H5Tunregister(H5T_conv_schar_short);
H5Tunregister(H5T_conv_schar_ushort);
H5Tunregister(H5T_conv_schar_int);
H5Tunregister(H5T_conv_schar_uint);
H5Tunregister(H5T_conv_schar_long);
H5Tunregister(H5T_conv_schar_ulong);
H5Tunregister(H5T_conv_schar_llong);
H5Tunregister(H5T_conv_schar_ullong);
H5Tunregister(H5T_conv_uchar_char);
H5Tunregister(H5T_conv_uchar_schar);
H5Tunregister(H5T_conv_uchar_short);
H5Tunregister(H5T_conv_uchar_ushort);
H5Tunregister(H5T_conv_uchar_int);
@ -337,7 +337,7 @@ h5_no_hwconv(void)
H5Tunregister(H5T_conv_uchar_llong);
H5Tunregister(H5T_conv_uchar_ullong);
H5Tunregister(H5T_conv_short_char);
H5Tunregister(H5T_conv_short_schar);
H5Tunregister(H5T_conv_short_uchar);
H5Tunregister(H5T_conv_short_ushort);
H5Tunregister(H5T_conv_short_int);
@ -347,7 +347,7 @@ h5_no_hwconv(void)
H5Tunregister(H5T_conv_short_llong);
H5Tunregister(H5T_conv_short_ullong);
H5Tunregister(H5T_conv_ushort_char);
H5Tunregister(H5T_conv_ushort_schar);
H5Tunregister(H5T_conv_ushort_uchar);
H5Tunregister(H5T_conv_ushort_short);
H5Tunregister(H5T_conv_ushort_int);
@ -357,7 +357,7 @@ h5_no_hwconv(void)
H5Tunregister(H5T_conv_ushort_llong);
H5Tunregister(H5T_conv_ushort_ullong);
H5Tunregister(H5T_conv_int_char);
H5Tunregister(H5T_conv_int_schar);
H5Tunregister(H5T_conv_int_uchar);
H5Tunregister(H5T_conv_int_short);
H5Tunregister(H5T_conv_int_ushort);
@ -367,7 +367,7 @@ h5_no_hwconv(void)
H5Tunregister(H5T_conv_int_llong);
H5Tunregister(H5T_conv_int_ullong);
H5Tunregister(H5T_conv_uint_char);
H5Tunregister(H5T_conv_uint_schar);
H5Tunregister(H5T_conv_uint_uchar);
H5Tunregister(H5T_conv_uint_short);
H5Tunregister(H5T_conv_uint_ushort);
@ -377,7 +377,7 @@ h5_no_hwconv(void)
H5Tunregister(H5T_conv_uint_llong);
H5Tunregister(H5T_conv_uint_ullong);
H5Tunregister(H5T_conv_long_char);
H5Tunregister(H5T_conv_long_schar);
H5Tunregister(H5T_conv_long_uchar);
H5Tunregister(H5T_conv_long_short);
H5Tunregister(H5T_conv_long_ushort);
@ -387,7 +387,7 @@ h5_no_hwconv(void)
H5Tunregister(H5T_conv_long_llong);
H5Tunregister(H5T_conv_long_ullong);
H5Tunregister(H5T_conv_ulong_char);
H5Tunregister(H5T_conv_ulong_schar);
H5Tunregister(H5T_conv_ulong_uchar);
H5Tunregister(H5T_conv_ulong_short);
H5Tunregister(H5T_conv_ulong_ushort);
@ -397,7 +397,7 @@ h5_no_hwconv(void)
H5Tunregister(H5T_conv_ulong_llong);
H5Tunregister(H5T_conv_ulong_ullong);
H5Tunregister(H5T_conv_llong_char);
H5Tunregister(H5T_conv_llong_schar);
H5Tunregister(H5T_conv_llong_uchar);
H5Tunregister(H5T_conv_llong_short);
H5Tunregister(H5T_conv_llong_ushort);
@ -407,7 +407,7 @@ h5_no_hwconv(void)
H5Tunregister(H5T_conv_llong_ulong);
H5Tunregister(H5T_conv_llong_ullong);
H5Tunregister(H5T_conv_ullong_char);
H5Tunregister(H5T_conv_ullong_schar);
H5Tunregister(H5T_conv_ullong_uchar);
H5Tunregister(H5T_conv_ullong_short);
H5Tunregister(H5T_conv_ullong_ushort);

5
test/mtime.c
View File

@ -42,7 +42,8 @@ main(void)
time_t now;
struct tm *tm;
H5G_stat_t sb1, sb2;
char buf1[32], buf2[32], filename[1024];
signed char buf1[32], buf2[32];
char filename[1024];
h5_reset();
fapl = h5_fileaccess();
@ -54,7 +55,7 @@ main(void)
if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0)
return 1;
if ((space=H5Screate_simple(1, size, NULL))<0) return 1;
if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_CHAR, space, H5P_DEFAULT))<0)
if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_SCHAR, space, H5P_DEFAULT))<0)
return 1;
now = time(NULL);
if (H5Dclose(dset)<0) return 1;

7
test/tattr.c
View File

@ -323,7 +323,8 @@ test_attr_compound_write(void)
ret = H5Tinsert(tid1, ATTR4_FIELDNAME2, attr4_field2_off, H5T_NATIVE_DOUBLE);
CHECK(ret, FAIL, "H5Tinsert");
attr4_field3_off=HOFFSET(struct attr4_struct, c);
ret = H5Tinsert(tid1, ATTR4_FIELDNAME3, attr4_field3_off, H5T_NATIVE_CHAR);
ret = H5Tinsert(tid1, ATTR4_FIELDNAME3, attr4_field3_off,
H5T_NATIVE_SCHAR);
CHECK(ret, FAIL, "H5Tinsert");
/* Create dataspace for 1st attribute */
@ -474,9 +475,9 @@ test_attr_compound_read(void)
class=H5Tget_class(field);
VERIFY(class, H5T_INTEGER, "H5Tget_class");
order=H5Tget_order(field);
VERIFY(order, H5Tget_order(H5T_NATIVE_CHAR), "H5Tget_order");
VERIFY(order, H5Tget_order(H5T_NATIVE_SCHAR), "H5Tget_order");
size=H5Tget_size(field);
VERIFY(size, H5Tget_size(H5T_NATIVE_CHAR), "H5Tget_size");
VERIFY(size, H5Tget_size(H5T_NATIVE_SCHAR), "H5Tget_size");
H5Tclose(field);
/* Read attribute information */

4
test/th5s.c
View File

@ -324,7 +324,7 @@ test_h5s_compound_scalar_write(void)
CHECK(tid1, FAIL, "H5Tcreate");
space4_field1_off=HOFFSET(struct space4_struct, c1);
ret = H5Tinsert(tid1, SPACE4_FIELDNAME1, space4_field1_off,
H5T_NATIVE_CHAR);
H5T_NATIVE_SCHAR);
CHECK(ret, FAIL, "H5Tinsert");
space4_field2_off=HOFFSET(struct space4_struct, u);
ret = H5Tinsert(tid1, SPACE4_FIELDNAME2, space4_field2_off,
@ -336,7 +336,7 @@ test_h5s_compound_scalar_write(void)
CHECK(ret, FAIL, "H5Tinsert");
space4_field4_off=HOFFSET(struct space4_struct, c2);
ret = H5Tinsert(tid1, SPACE4_FIELDNAME4, space4_field4_off,
H5T_NATIVE_CHAR);
H5T_NATIVE_SCHAR);
CHECK(ret, FAIL, "H5Tinsert");
/* Create scalar dataspace */

4
tools/h5dump.c
View File

@ -138,8 +138,8 @@ H5G_stat_t statbuf;
printf( "H5T_STD_U64BE");
else if (H5Tequal(type, H5T_STD_U64LE))
printf( "H5T_STD_U64LE");
else if (H5Tequal(type, H5T_NATIVE_CHAR))
printf( "H5T_NATIVE_CHAR");
else if (H5Tequal(type, H5T_NATIVE_SCHAR))
printf( "H5T_NATIVE_SCHAR");
else if (H5Tequal(type, H5T_NATIVE_UCHAR))
printf( "H5T_NATIVE_UCHAR");
else if (H5Tequal(type, H5T_NATIVE_SHORT))

4
tools/h5dumputil.c
View File

@ -126,7 +126,7 @@ h5dump_sprint(char *s/*out*/, const h5dump_t *info, hid_t type, void *vp)
sprintf(temp, "%g", *((double*)vp));
} else if (H5Tequal(type, H5T_NATIVE_FLOAT)) {
sprintf(temp, "%g", *((float*)vp));
} else if (H5Tequal(type, H5T_NATIVE_CHAR) ||
} else if (H5Tequal(type, H5T_NATIVE_SCHAR) ||
H5Tequal(type, H5T_NATIVE_UCHAR)) {
switch (*((char*)vp)) {
case '"':
@ -436,7 +436,7 @@ h5dump_fixtype(hid_t f_type)
* memory type available.
*/
if (size<=sizeof(char)) {
m_type = H5Tcopy(H5T_NATIVE_CHAR);
m_type = H5Tcopy(H5T_NATIVE_SCHAR);
} else if (size<=sizeof(short)) {
m_type = H5Tcopy(H5T_NATIVE_SHORT);
} else if (size<=sizeof(int)) {

2
tools/h5import.c
View File

@ -112,7 +112,7 @@ main (int argc, char *argv[])
if ((space = H5Screate_simple (1, size, size))<0) goto next;
/* Dataset */
if ((dset=H5Dcreate (file, dset_name, H5T_NATIVE_CHAR,
if ((dset=H5Dcreate (file, dset_name, H5T_NATIVE_SCHAR,
space, H5P_DEFAULT))<0) goto next;

4
tools/h5ls.c
View File

@ -165,8 +165,8 @@ display_string(const char *s)
static hbool_t
display_native_type(hid_t type, int __unused__ indent)
{
if (H5Tequal(type, H5T_NATIVE_CHAR)) {
printf("native char");
if (H5Tequal(type, H5T_NATIVE_SCHAR)) {
printf("native signed char");
} else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
printf("native unsigned char");
} else if (H5Tequal(type, H5T_NATIVE_INT)) {

4
tools/h5toh4.c
View File

@ -1189,7 +1189,7 @@ int32 h5type_to_h4type(hid_t h5_datatype)
h4_datatype = DFNT_FLOAT32;
} else if (H5Tequal(h5_datatype,H5T_IEEE_F64LE)) {
h4_datatype = DFNT_FLOAT64;
} else if (H5Tequal(h5_datatype,H5T_NATIVE_CHAR)) {
} else if (H5Tequal(h5_datatype,H5T_NATIVE_SCHAR)) {
h4_datatype = DFNT_INT8;
} else if (H5Tequal(h5_datatype,H5T_NATIVE_UCHAR)) {
h4_datatype = DFNT_UINT8;
@ -1244,7 +1244,7 @@ hid_t h4type_to_memtype(int32 h4_datatype)
case DFNT_INT8:
case DFNT_NINT8:
case DFNT_LINT8:
mem_datatype = H5T_NATIVE_CHAR; break;
mem_datatype = H5T_NATIVE_SCHAR; break;
case DFNT_UINT8:
case DFNT_NUINT8:
case DFNT_LUINT8:

6
tools/h5tools.c
View File

@ -125,7 +125,7 @@ h5dump_sprint(char *s/*out*/, const h5dump_t *info, hid_t type, void *vp)
sprintf(temp, "%g", *((float*)vp));
} else if (info->ascii &&
(H5Tequal(type, H5T_NATIVE_CHAR) ||
(H5Tequal(type, H5T_NATIVE_SCHAR) ||
H5Tequal(type, H5T_NATIVE_UCHAR))) {
switch (*((char*)vp)) {
case '"':
@ -223,7 +223,7 @@ h5dump_sprint(char *s/*out*/, const h5dump_t *info, hid_t type, void *vp)
}
if (quote) sprintf(temp+strlen(temp), "%c", quote);
} else if (H5Tequal(type, H5T_NATIVE_CHAR)) {
} else if (H5Tequal(type, H5T_NATIVE_SCHAR)) {
sprintf(temp, "%d", *((signed char*)vp));
} else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
@ -525,7 +525,7 @@ h5dump_fixtype(hid_t f_type)
* memory type available.
*/
if (size<=sizeof(char)) {
m_type = H5Tcopy(H5T_NATIVE_CHAR);
m_type = H5Tcopy(H5T_NATIVE_SCHAR);
} else if (size<=sizeof(short)) {
m_type = H5Tcopy(H5T_NATIVE_SHORT);
} else if (size<=sizeof(int)) {