summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-11-25 17:21:21 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-11-25 17:21:21 (GMT)
commitffcbc32d669a0aabae30ed554a2a10446e69d25d (patch)
treee8e3b0648004b21b900b37ee0da48034d74e662f /tools
parent37ce8f33ca1bc4361426b5374a12926b98839b13 (diff)
downloadhdf5-ffcbc32d669a0aabae30ed554a2a10446e69d25d.zip
hdf5-ffcbc32d669a0aabae30ed554a2a10446e69d25d.tar.gz
hdf5-ffcbc32d669a0aabae30ed554a2a10446e69d25d.tar.bz2
[svn-r952] Changes since 19981125
---------------------- ./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.
Diffstat (limited to 'tools')
-rw-r--r--tools/h5dump.c4
-rw-r--r--tools/h5dumputil.c4
-rw-r--r--tools/h5import.c2
-rw-r--r--tools/h5ls.c4
-rw-r--r--tools/h5toh4.c4
-rw-r--r--tools/h5tools.c6
6 files changed, 12 insertions, 12 deletions
diff --git a/tools/h5dump.c b/tools/h5dump.c
index 7c8d922..b0d19a0 100644
--- a/tools/h5dump.c
+++ b/tools/h5dump.c
@@ -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))
diff --git a/tools/h5dumputil.c b/tools/h5dumputil.c
index b23251b..d033092 100644
--- a/tools/h5dumputil.c
+++ b/tools/h5dumputil.c
@@ -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)) {
diff --git a/tools/h5import.c b/tools/h5import.c
index 90efec7..9b485c1 100644
--- a/tools/h5import.c
+++ b/tools/h5import.c
@@ -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;
diff --git a/tools/h5ls.c b/tools/h5ls.c
index fa0c00b..db650b0 100644
--- a/tools/h5ls.c
+++ b/tools/h5ls.c
@@ -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)) {
diff --git a/tools/h5toh4.c b/tools/h5toh4.c
index e44a339..1d4ff55 100644
--- a/tools/h5toh4.c
+++ b/tools/h5toh4.c
@@ -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:
diff --git a/tools/h5tools.c b/tools/h5tools.c
index b7a7e75..a4fe4fa 100644
--- a/tools/h5tools.c
+++ b/tools/h5tools.c
@@ -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)) {