summaryrefslogtreecommitdiffstats
path: root/src/H5T.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-07-26 20:03:12 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-07-26 20:03:12 (GMT)
commit0728b38ddd4d0c31269f26f5b600f4e569670f6f (patch)
treedc6495de1a103f179a3cdae43ce6410468c1cee1 /src/H5T.c
parent0ea9a38644765aa4045b9110e86c5e50a5f24dac (diff)
downloadhdf5-0728b38ddd4d0c31269f26f5b600f4e569670f6f.zip
hdf5-0728b38ddd4d0c31269f26f5b600f4e569670f6f.tar.gz
hdf5-0728b38ddd4d0c31269f26f5b600f4e569670f6f.tar.bz2
[svn-r22609] Description:
Bring r22608 from trunk to 1.8 branch: Switch propert list/class iteration from internal to external form of iteration, cleaning up and simplifying the code a bit. Bring other general improvements from plist_encode_decode branch back to trunk. Clean up many warnings. Tested on: Mac OSX/64 10.7.4 (amazon) w/gcc 4.7, debug and C++ & FORTRAN (too minor to require h5committest)
Diffstat (limited to 'src/H5T.c')
-rw-r--r--src/H5T.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/H5T.c b/src/H5T.c
index b2d97bc..5a3c17b 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -734,7 +734,7 @@ DESCRIPTION
Initializes any interface-specific data or routines.
--------------------------------------------------------------------------*/
-herr_t
+static herr_t
H5T_init_interface(void)
{
H5T_t *native_schar=NULL; /* Datatype structure for native signed char */
@@ -3155,7 +3155,7 @@ done:
*-------------------------------------------------------------------------
*/
H5T_t *
-H5T_copy(const H5T_t *old_dt, H5T_copy_t method)
+H5T_copy(H5T_t *old_dt, H5T_copy_t method)
{
H5T_t *new_dt = NULL, *tmp = NULL;
H5T_shared_t *reopened_fo = NULL;
@@ -3840,8 +3840,10 @@ H5T_set_size(H5T_t *dt, size_t size)
case H5T_ENUM:
case H5T_VLEN:
case H5T_ARRAY:
- assert("can't happen" && 0);
case H5T_REFERENCE:
+ assert("can't happen" && 0);
+ case H5T_NO_CLASS:
+ case H5T_NCLASSES:
assert("invalid type" && 0);
default:
assert("not implemented yet" && 0);
@@ -4296,6 +4298,9 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset)
/*void */
break;
+ case H5R_BADTYPE:
+ case H5R_MAXTYPE:
+ assert("invalid type" && 0);
default:
assert("not implemented yet" && 0);
}
@@ -5147,7 +5152,7 @@ H5T_set_loc(H5T_t *dt, H5F_t *f, H5T_loc_t loc)
} /* end for */
/* Apply the accumulated size change to the datatype */
- dt->shared->size += accum_change;
+ dt->shared->size = (size_t)(dt->shared->size + accum_change);
break;
case H5T_VLEN: /* Recurse on the VL information if it's VL, compound or array, then free VL sequence */