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/H5I.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/H5I.c')
-rw-r--r-- | src/H5I.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -687,7 +687,7 @@ H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref) } /* end else */ /* Free the node */ - (void)H5FL_FREE(H5I_id_info_t, cur); + cur = H5FL_FREE(H5I_id_info_t, cur); } /* end if */ else { /* Advance to next node */ @@ -1330,15 +1330,14 @@ H5I_remove(hid_t id) /* If there's room, and we can save IDs of this type, then save the struct (and its ID) for future re-use */ - if ((type_ptr->reuse_ids)&&(type_ptr->free_count < MAX_FREE_ID_STRUCTS)) { + if((type_ptr->reuse_ids)&&(type_ptr->free_count < MAX_FREE_ID_STRUCTS)) { curr_id->next = type_ptr->next_id_ptr; type_ptr->next_id_ptr = curr_id; type_ptr->free_count++; - /* Otherwise, just toss it. */ - } else { - (void)H5FL_FREE(H5I_id_info_t, curr_id); } /* end if */ - + /* Otherwise, just toss it. */ + else + curr_id = H5FL_FREE(H5I_id_info_t, curr_id); } else { /* couldn't find the ID in the proper place */ HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, NULL, "invalid ID") |