summaryrefslogtreecommitdiffstats
path: root/src/H5T.c
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2002-11-07 21:25:15 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2002-11-07 21:25:15 (GMT)
commitdddcde81eac7c9b6d2051320578457e518ed6ba6 (patch)
treedb43400e823cc4704bb627f2d78501ed16f02fa9 /src/H5T.c
parent0b4b91cb559bdb9268e8b3d5b7efea4d85b6a7d7 (diff)
downloadhdf5-dddcde81eac7c9b6d2051320578457e518ed6ba6.zip
hdf5-dddcde81eac7c9b6d2051320578457e518ed6ba6.tar.gz
hdf5-dddcde81eac7c9b6d2051320578457e518ed6ba6.tar.bz2
[svn-r6064] Purpose:
Code Cleanup Description: A function was returning "NULL" instead of "FAIL" for an error condition. Renamed the variable "class" to "h5_class" since class is a keyword in C++ and might mess up with a C++ compiler... Platforms tested: Eirene pp (too small a change for 3 tests)
Diffstat (limited to 'src/H5T.c')
-rw-r--r--src/H5T.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5T.c b/src/H5T.c
index 080ac09..a3bd7cd 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -2684,7 +2684,7 @@ hid_t H5Tget_native_type(hid_t type_id, H5T_direction_t direction)
if(direction!=H5T_DIR_DEFAULT && direction!=H5T_DIR_ASCEND
&& direction!=H5T_DIR_DESCEND)
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not valid direction value");
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not valid direction value");
if((new_dt = H5T_get_native_type(dt, direction, NULL, NULL, &comp_size))==NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "cannot retrieve native type");
@@ -2722,7 +2722,7 @@ done:
H5T_t* H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_align, size_t *offset, size_t *comp_size)
{
H5T_t *dt; /* Datatype to make native */
- H5T_class_t class; /* Class of datatype to make native */
+ H5T_class_t h5_class; /* Class of datatype to make native */
size_t size; /* Size of datatype to make native */
int nmemb; /* Number of members in compound & enum types */
H5T_t *super_type; /* Super type of VL, array and enum datatypes */
@@ -2735,13 +2735,13 @@ H5T_t* H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *stru
assert(dtype);
- if((class = H5T_get_class(dtype))<0)
+ if((h5_class = H5T_get_class(dtype))<0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid class");
if((size = H5T_get_size(dtype))==0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid size");
- switch(class) {
+ switch(h5_class) {
case H5T_INTEGER:
{
H5T_sign_t sign; /* Signedness of integer type */