diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-20 19:05:15 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-20 19:05:15 (GMT) |
commit | c403f235f9b7c8d7abdff3836e76cc5724a5f82f (patch) | |
tree | 55e265e60128496b9cf773196e53c6d9f74c79d9 /src/H5Oattr.c | |
parent | 37ef89af1daf8c7a6c31889a16c0b55c184a815e (diff) | |
download | hdf5-c403f235f9b7c8d7abdff3836e76cc5724a5f82f.zip hdf5-c403f235f9b7c8d7abdff3836e76cc5724a5f82f.tar.gz hdf5-c403f235f9b7c8d7abdff3836e76cc5724a5f82f.tar.bz2 |
[svn-r18596] Description:
Bring r18595 from trunk to 1.8 branch:
Clean up compiler warnings
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug
(too minor to require h5committest)
Diffstat (limited to 'src/H5Oattr.c')
-rw-r--r-- | src/H5Oattr.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/H5Oattr.c b/src/H5Oattr.c index 35f02a8..ce8e4af 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -205,7 +205,7 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned UNUSED mesg_fl HDmemcpy(&(attr->shared->ds->extent), extent, sizeof(H5S_extent_t)); /* Release temporary extent information */ - (void)H5FL_FREE(H5S_extent_t, extent); + extent = H5FL_FREE(H5S_extent_t, extent); /* Default to entire dataspace being selected */ if(H5S_select_all(attr->shared->ds, FALSE) < 0) @@ -810,13 +810,34 @@ H5O_attr_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream, int in case H5T_CSET_ASCII: s = "ASCII"; break; + case H5T_CSET_UTF8: s = "UTF-8"; break; - default: + + case H5T_CSET_RESERVED_2: + case H5T_CSET_RESERVED_3: + case H5T_CSET_RESERVED_4: + case H5T_CSET_RESERVED_5: + case H5T_CSET_RESERVED_6: + case H5T_CSET_RESERVED_7: + case H5T_CSET_RESERVED_8: + case H5T_CSET_RESERVED_9: + case H5T_CSET_RESERVED_10: + case H5T_CSET_RESERVED_11: + case H5T_CSET_RESERVED_12: + case H5T_CSET_RESERVED_13: + case H5T_CSET_RESERVED_14: + case H5T_CSET_RESERVED_15: sprintf(buf, "H5T_CSET_RESERVED_%d", (int)(mesg->shared->encoding)); s = buf; break; + + case H5T_CSET_ERROR: + default: + sprintf(buf, "Unknown character set: %d", (int)(mesg->shared->encoding)); + s = buf; + break; } /* end switch */ fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set of Name:", |