mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r20057] Correct comment handling and remove cut/paste oversights

Browse Source 
merge r20056 from 1.8
This commit is contained in:
Allen Byrne 2011-02-07 14:31:14 -05:00
parent 6c7cce106d
commit 5edf33586f
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/h5dump/h5dump.c
View File

@ -2211,7 +2211,6 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
unsigned attr_crt_order_flags;
hid_t dcpl_id; /* dataset creation property list ID */
if ((dcpl_id = H5Dget_create_plist(did)) < 0)
{
error_msg("error in getting creation property list ID\n");
@ -2652,22 +2651,21 @@ dump_comment(hid_t obj_id)
cmt_bufsize = H5Oget_comment(obj_id, comment, buf_size);
// if the actual length of the comment is longer than cmt_bufsize, then call
// H5Oget_comment again with the correct value.
// If the call to H5Oget_comment returned an error, skip this block
if (cmt_bufsize >= 0) {
comment = (char *)HDmalloc((size_t)cmt_bufsize++); // new_size including null terminator
if(comment)
/* if the actual length of the comment is longer than cmt_bufsize, then call
* H5Oget_comment again with the correct value.
* If the call to H5Oget_comment returned an error, skip this block */
if (cmt_bufsize > 0) {
comment = (char *)HDmalloc((size_t)cmt_bufsize); /* new_size including null terminator */
if(comment) {
cmt_bufsize = H5Oget_comment(obj_id, comment, cmt_bufsize);
if(cmt_bufsize > 0) {
indentation(indent);
printf("COMMENT \"%s\"\n", comment);
} /* end if */
HDfree(comment);
}
}
if(cmt_bufsize > 0) {
comment[cmt_bufsize] = '\0';
indentation(indent);
printf("COMMENT \"%s\"\n", comment);
} /* end if */
if(comment)
HDfree(comment);
} /* end dump_comment() */

27
tools/h5ls/h5ls.c
View File

@ -1815,22 +1815,21 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
/* Object comment */
cmt_bufsize = H5Oget_comment(obj, comment, buf_size);
// if the actual length of the comment is longer than cmt_bufsize, then call
// H5Oget_comment again with the correct value.
// If the call to H5Oget_comment returned an error, skip this block
if (cmt_bufsize >= 0) {
comment = (char *)HDmalloc((size_t)cmt_bufsize++); // new_size including null terminator
if(comment)
/* if the actual length of the comment is longer than cmt_bufsize, then call
* H5Oget_comment again with the correct value.
* If the call to H5Oget_comment returned an error, skip this block */
if (cmt_bufsize > 0) {
comment = (char *)HDmalloc((size_t)cmt_bufsize); /* new_size including null terminator */
if(comment) {
cmt_bufsize = H5Oget_comment(obj, comment, cmt_bufsize);
if(cmt_bufsize > 0) {
printf(" %-10s \"", "Comment:");
display_string(stdout, comment, FALSE);
puts("\"");
} /* end if */
HDfree(comment);
}
}
if(cmt_bufsize > 0) {
comment[cmt_bufsize] = '\0';
printf(" %-10s \"", "Comment:");
display_string(stdout, comment, FALSE);
puts("\"");
} /* end if */
if(comment)
HDfree(comment);
} /* end if */
/* Detailed list for object */