summaryrefslogtreecommitdiffstats
path: root/tools/h5dump/h5dump.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2011-05-20 22:04:03 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2011-05-20 22:04:03 (GMT)
commit1d9307bd91d51e15e408a584b4c761cacf916b96 (patch)
treee9e1e7a3b5c0e627e28985917f2e6412f17384a9 /tools/h5dump/h5dump.c
parent3f11adaec28a55a5772d702752b433aa0289adaf (diff)
downloadhdf5-1d9307bd91d51e15e408a584b4c761cacf916b96.zip
hdf5-1d9307bd91d51e15e408a584b4c761cacf916b96.tar.gz
hdf5-1d9307bd91d51e15e408a584b4c761cacf916b96.tar.bz2
[svn-r20885] Description:
Bring Coverity changes back to trunk: r20340: Address coverity issue 248. Set freed pointer to NULL if realloc fails, then check for NULL before attempting to close array of handles stored in memory addressed by pointer. r20341: Added initialization udata.path = NULL; udata.visited = NULL; to prevent unintialized use after done: label. Do C-style initialization AFTER all variable definitions. r20342: Fix valgrind error in H5DUMP-XML-tall.h5 r20343: Addressed Coverity issue 591 - check the return value of H5S_SELECT_ITER_RELEASE. r20344: Added initialization udata.path = NULL; to prevent uninitialized used after done: label r20347: Purpose: Fix memory leak in overhead.c Description: Fixed leak in test() in overhead.c where array "had" was never freed. r20348: Addressed Coverity issue 705 - added prototype for resize_configs_are_equal to cache_common.h. r20392: Purpose: Fix coverity issues 1677 and 1678 Description: Added return value checking for 4 funciton calls in H5tools_get_symlink_info(). r20394: Purpose: Fix coverity issues 1674 and 1675 Description: Modified H5Epush2() and H5E_printf_stack() to keep track of whether va_start() has been called, and to call va_end() at the end if so. r20395: Should be H5MM_calloc(count * sizeof(void*)). Fixed --gh r20396: Should be H5MM_calloc(count * sizeof(void*)). Fixed. --gh Tested on: Mac OSX/32 10.6.7 (amazon) w/debug & production (h5committested on branch)
Diffstat (limited to 'tools/h5dump/h5dump.c')
-rw-r--r--tools/h5dump/h5dump.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index cfeaaef..fcb7bd3 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -6193,7 +6193,7 @@ xml_dump_group(hid_t gid, const char *name)
if(HDstrcmp(name, "/") == 0) {
isRoot = 1;
tmp = HDstrdup("/");
- }
+ }
else {
tmp = (char *)HDmalloc(HDstrlen(prefix) + HDstrlen(name) + 2);
HDstrcpy(tmp, prefix);
@@ -6213,7 +6213,7 @@ xml_dump_group(hid_t gid, const char *name)
H5Oget_info(gid, &oinfo);
if(oinfo.rc > 1) {
- obj_t *found_obj; /* Found object */
+ obj_t *found_obj; /* Found object */
/* Group with more than one link to it... */
found_obj = search_obj(group_table, oinfo.addr);
@@ -6222,7 +6222,7 @@ xml_dump_group(hid_t gid, const char *name)
indentation(indent);
error_msg("internal error (file %s:line %d)\n", __FILE__, __LINE__);
h5tools_setstatus(EXIT_FAILURE);
- }
+ }
else {
char *t_name = xml_escape_the_name(name);
char *grpxid = (char *)malloc(100);
@@ -6237,7 +6237,7 @@ xml_dump_group(hid_t gid, const char *name)
xml_name_to_XID("/", grpxid, 100, 1);
HDfprintf(stdout, "<%sRootGroup OBJ-XID=\"%s\" H5Path=\"%s\">\n",
xmlnsprefix, grpxid, "/");
- }
+ }
else {
t_objname = xml_escape_the_name(found_obj->objname);
par_name = xml_escape_the_name(par);
@@ -6263,7 +6263,7 @@ xml_dump_group(hid_t gid, const char *name)
free(par_name);
}
free(ptrstr);
- }
+ }
else {
/* first time this group has been seen -- describe it */
@@ -6271,7 +6271,7 @@ xml_dump_group(hid_t gid, const char *name)
xml_name_to_XID("/", grpxid, 100, 1);
HDfprintf(stdout, "<%sRootGroup OBJ-XID=\"%s\" H5Path=\"%s\">\n",
xmlnsprefix, grpxid, "/");
- }
+ }
else {
char *t_tmp = xml_escape_the_name(tmp);
@@ -6319,7 +6319,7 @@ xml_dump_group(hid_t gid, const char *name)
/* iterate through all the links */
- if( (sort_by == H5_INDEX_CRT_ORDER) && (crt_order_flags & H5P_CRT_ORDER_TRACKED))
+ if((sort_by == H5_INDEX_CRT_ORDER) && (crt_order_flags & H5P_CRT_ORDER_TRACKED))
H5Literate(gid, sort_by, sort_order, NULL, dump_all_cb, NULL);
else
H5Literate(gid, H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL);
@@ -6330,7 +6330,7 @@ xml_dump_group(hid_t gid, const char *name)
free(grpxid);
free(parentxid);
}
- }
+ }
else {
/* only link -- must be first time! */
@@ -6341,7 +6341,7 @@ xml_dump_group(hid_t gid, const char *name)
if(isRoot) {
xml_name_to_XID("/", grpxid, 100, 1);
HDfprintf(stdout, "<%sRootGroup OBJ-XID=\"%s\" H5Path=\"%s\">\n", xmlnsprefix, grpxid, "/");
- }
+ }
else {
char *t_tmp = xml_escape_the_name(tmp);
@@ -6403,11 +6403,11 @@ xml_dump_group(hid_t gid, const char *name)
if(isRoot)
HDfprintf(stdout, "</%sRootGroup>\n", xmlnsprefix);
else
- HDfprintf(stdout, "</%sGroup>\n" , xmlnsprefix);
+ HDfprintf(stdout, "</%sGroup>\n", xmlnsprefix);
if(par)
free(par);
if(tmp)
- free(tmp);
+ free(tmp);
}
/*-------------------------------------------------------------------------