summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/.distdep264
-rw-r--r--src/H5.c4
-rw-r--r--src/H5T.c74
-rw-r--r--src/H5Tconv.c152
-rw-r--r--src/H5Tpkg.h64
-rw-r--r--src/H5Tpublic.h5
-rw-r--r--src/H5detect.c2
7 files changed, 283 insertions, 282 deletions
diff --git a/src/.distdep b/src/.distdep
index 4dfd2fb..6c4d8ff 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -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
diff --git a/src/H5.c b/src/H5.c
index 09f3c85..487dc13 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -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) {
diff --git a/src/H5T.c b/src/H5T.c
index 245f7f4..2f534c9 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -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");
}
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 914c255..1012a20 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -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);
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index b451e3f..950d5a5 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -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_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+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_ushort_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+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_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_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+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_uint_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+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_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_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+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_ulong_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+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_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,
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 55651a2..e301d72 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -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;
diff --git a/src/H5detect.c b/src/H5detect.c
index 57aa066..bf97452 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -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++;