summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doxygen/aliases2
-rw-r--r--fortran/test/tH5I.F902
-rw-r--r--java/src/hdf/hdf5lib/H5.java4
-rw-r--r--release_docs/HISTORY-1_0-1_8_0.txt4
-rw-r--r--src/H5Pocpypl.c2
-rw-r--r--src/H5Ppublic.h4
-rw-r--r--src/H5Zscaleoffset.c22
-rw-r--r--test/API/tattr.c2
-rw-r--r--test/API/tmisc.c10
-rw-r--r--test/dsets.c2
-rw-r--r--test/gen_mergemsg.c10
-rw-r--r--test/tattr.c2
-rw-r--r--test/tmisc.c10
13 files changed, 38 insertions, 38 deletions
diff --git a/doxygen/aliases b/doxygen/aliases
index 96977f3..bfafd7e 100644
--- a/doxygen/aliases
+++ b/doxygen/aliases
@@ -75,7 +75,7 @@ ALIASES += space_id="\param[in] space_id Dataspace identifier"
ALIASES += space_id{1}="\param[in] \1 Dataspace identifier"
################################################################################
-# Dataypes
+# Datatypes
################################################################################
ALIASES += type_id="\param[in] type_id Datatype identifier"
diff --git a/fortran/test/tH5I.F90 b/fortran/test/tH5I.F90
index 7f9b3ab..a5fedb9 100644
--- a/fortran/test/tH5I.F90
+++ b/fortran/test/tH5I.F90
@@ -245,7 +245,7 @@ CONTAINS
CALL h5sclose_f(dspace_id, error)
CALL check("h5sclose_f",error,total_error)
!
- ! Close the dataype.
+ ! Close the datatype.
!
CALL h5tclose_f(atype_id, error)
CALL check("h5tclose_f",error,total_error)
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index 5a17075..ea51512 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -13806,7 +13806,7 @@ public class H5 implements java.io.Serializable {
/**
* @ingroup JH5T
*
- * H5Tcreate creates a new dataype of the specified class with the specified number of bytes.
+ * H5Tcreate creates a new datatype of the specified class with the specified number of bytes.
*
* @param tclass
* IN: Class of datatype to create.
@@ -15261,7 +15261,7 @@ public class H5 implements java.io.Serializable {
/**
* @ingroup JH5T
*
- * H5Tvlen_create creates a new variable-length (VL) dataype.
+ * H5Tvlen_create creates a new variable-length (VL) datatype.
*
* @param base_id
* IN: Identifier of parent datatype.
diff --git a/release_docs/HISTORY-1_0-1_8_0.txt b/release_docs/HISTORY-1_0-1_8_0.txt
index 333d0dc..6d9148d 100644
--- a/release_docs/HISTORY-1_0-1_8_0.txt
+++ b/release_docs/HISTORY-1_0-1_8_0.txt
@@ -8448,7 +8448,7 @@ C. Changes Since Version 1.0.1
-------------------
H5Tget_super - return the base datatype from which a
datatype is derived
- H5Tvlen_create - creates a new variable-length dataype
+ H5Tvlen_create - creates a new variable-length datatype
H5Tenum_create - creates a new enumeration datatype
H5Tenum_insert - inserts a new enumeration datatype member
H5Tenum_nameof - returns the symbol name corresponding to a
@@ -8944,7 +8944,7 @@ Datatypes
H5Tset_strpad - set string padding
+ H5Tget_super - return the base datatype from which a
datatype is derived
- + H5Tvlen_create - creates a new variable-length dataype
+ + H5Tvlen_create - creates a new variable-length datatype
+ H5Tenum_create - creates a new enumeration datatype
+ H5Tenum_insert - inserts a new enumeration datatype member
+ H5Tenum_nameof - returns the symbol name corresponding to a
diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c
index 94e0a12..98c9d8a 100644
--- a/src/H5Pocpypl.c
+++ b/src/H5Pocpypl.c
@@ -706,7 +706,7 @@ done:
* target file when merging committed datatypes during H5Ocopy
* (i.e. when using the H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG flag
* as set by H5Pset_copy_object). If the source named
- * dataype is not found in the list of paths created by this
+ * datatype is not found in the list of paths created by this
* function, the entire file will be searched.
*
* Usage: H5Padd_merge_committed_dtype_path(plist_id, path)
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 53a455c..987aeba 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -9584,10 +9584,10 @@ H5_DLL herr_t H5Pget_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t *func,
* committed datatype.
* If copied in a single H5Ocopy() operation, objects
* that share a committed datatype in the source will
- * share an anonymous committed dataype in the
+ * share an anonymous committed datatype in the
* destination copy. Subsequent H5Ocopy() operations,
* however, will be unaware of prior anonymous committed
- * dataypes and will create new ones.
+ * datatypes and will create new ones.
*
* See the “See Also” section immediately below for
* functions related to the use of this flag.</td>
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index 6613ec2..4f35fe3 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -326,7 +326,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
{ \
if (sizeof(type) <= sizeof(long long)) \
H5Z_scaleoffset_get_filval_1(type, cd_values, filval) else HGOTO_ERROR( \
- H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
+ H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
}
/* Find maximum and minimum values of a buffer with fill value defined for integer type */
@@ -445,7 +445,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
} \
} \
else \
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
}
/* Precompress for unsigned integer type */
@@ -553,7 +553,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
min * pow_fun((type)10, (type)D_val)); \
} \
else \
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
}
/* Modify values of data in precompression if fill value undefined for floating-point type */
@@ -572,7 +572,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
*(long long *)((void *)&buf[i]) = llround_fun(buf[i] * pow_fun((type)10, (type)D_val) - \
min * pow_fun((type)10, (type)D_val)); \
else \
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
}
/* Save the minimum value for floating-point type */
@@ -590,7 +590,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
H5MM_memcpy(((char *)minval) + (sizeof(long long) - sizeof(type)), &min, sizeof(type)); \
} /* end else */ \
else \
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
}
/* Precompress for floating-point type using variable-minimum-bits method */
@@ -674,7 +674,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
H5MM_memcpy(&min, ((char *)&minval) + (sizeof(long long) - sizeof(type)), sizeof(type)); \
} /* end else */ \
else \
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
}
/* Modify values of data in postdecompression if fill value defined for floating-point type */
@@ -701,7 +701,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
: (type)(*(long long *)((void *)&buf[i])) / pow_fun((type)10, (type)D_val) + \
min); \
else \
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
}
/* Modify values of data in postdecompression if fill value undefined for floating-point type */
@@ -717,7 +717,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
for (i = 0; i < d_nelmts; i++) \
buf[i] = ((type)(*(long long *)((void *)&buf[i])) / pow_fun((type)10, (type)D_val) + min); \
else \
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
}
/* Postdecompress for floating-point type using variable-minimum-bits method */
@@ -827,7 +827,7 @@ H5Z__scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size, unsigned dt
type = t_ulong_long;
#endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
else
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory datatype")
}
if (dtype_sign == H5Z_SCALEOFFSET_SGN_2) { /* signed integer */
@@ -844,7 +844,7 @@ H5Z__scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size, unsigned dt
type = t_long_long;
#endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
else
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory datatype")
}
}
@@ -854,7 +854,7 @@ H5Z__scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size, unsigned dt
else if (dtype_size == sizeof(double))
type = t_double;
else
- HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory datatype")
}
/* Set return value */
diff --git a/test/API/tattr.c b/test/API/tattr.c
index d006eb8..5ae1167 100644
--- a/test/API/tattr.c
+++ b/test/API/tattr.c
@@ -11767,7 +11767,7 @@ test_attr(void)
test_attr_delete(my_fapl); /* Test H5A code for deleting attributes */
/* This next test uses its own file information */
- test_attr_dtype_shared(my_fapl); /* Test using shared dataypes in attributes */
+ test_attr_dtype_shared(my_fapl); /* Test using shared datatypes in attributes */
/* This next test uses its own file information */
test_attr_duplicate_ids(my_fapl);
diff --git a/test/API/tmisc.c b/test/API/tmisc.c
index d35a00b..9013422 100644
--- a/test/API/tmisc.c
+++ b/test/API/tmisc.c
@@ -4839,7 +4839,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR1_LEN);
@@ -4865,7 +4865,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR2_LEN);
@@ -4935,7 +4935,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR3_LEN);
@@ -4981,7 +4981,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR2_LEN);
@@ -5043,7 +5043,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR2_LEN);
diff --git a/test/dsets.c b/test/dsets.c
index fc3de08..9208233 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1633,7 +1633,7 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
* Function: can_apply_bogus
*
* Purpose: A bogus 'can apply' callback that returns 0 for H5T_NATIVE_DOUBLE
- * dataype, but returns 1 for all other datatypes
+ * datatype, but returns 1 for all other datatypes
*
* Return: Success: Described above
* Failure: 0
diff --git a/test/gen_mergemsg.c b/test/gen_mergemsg.c
index 68d0692..b8d5e99 100644
--- a/test/gen_mergemsg.c
+++ b/test/gen_mergemsg.c
@@ -81,7 +81,7 @@ main()
sid = H5Screate(H5S_SCALAR);
assert(sid > 0);
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
assert(tid > 0);
ret = H5Tset_size(tid, ATTR1_LEN);
@@ -107,7 +107,7 @@ main()
sid = H5Screate(H5S_SCALAR);
assert(sid > 0);
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
assert(tid > 0);
ret = H5Tset_size(tid, ATTR2_LEN);
@@ -177,7 +177,7 @@ main()
sid = H5Screate(H5S_SCALAR);
assert(sid > 0);
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
assert(tid > 0);
ret = H5Tset_size(tid, ATTR3_LEN);
@@ -223,7 +223,7 @@ main()
sid = H5Screate(H5S_SCALAR);
assert(sid > 0);
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
assert(tid > 0);
ret = H5Tset_size(tid, ATTR2_LEN);
@@ -285,7 +285,7 @@ main()
sid = H5Screate(H5S_SCALAR);
assert(sid > 0);
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
assert(tid > 0);
ret = H5Tset_size(tid, ATTR2_LEN);
diff --git a/test/tattr.c b/test/tattr.c
index 5dd5736..20dbd25 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -11509,7 +11509,7 @@ test_attr(void)
test_attr_delete(my_fapl); /* Test H5A code for deleting attributes */
/* This next test uses its own file information */
- test_attr_dtype_shared(my_fapl); /* Test using shared dataypes in attributes */
+ test_attr_dtype_shared(my_fapl); /* Test using shared datatypes in attributes */
/* This next test uses its own file information */
test_attr_duplicate_ids(my_fapl);
diff --git a/test/tmisc.c b/test/tmisc.c
index 0b04b2c..4638d74 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -4751,7 +4751,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR1_LEN);
@@ -4777,7 +4777,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR2_LEN);
@@ -4847,7 +4847,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR3_LEN);
@@ -4893,7 +4893,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR2_LEN);
@@ -4955,7 +4955,7 @@ test_misc25a(void)
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
- /* Create dataype for attribute */
+ /* Create datatype for attribute */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcopy");
ret = H5Tset_size(tid, (size_t)MISC25A_ATTR2_LEN);
generated by cgit v0.12 at 2024-11-05 02:59:22 (GMT)