Merge pull request #1298 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '4616c1e863ab756d22af696672ba9bc2fe0eea25':
  Add custom target to force wait on generated file
  TRILAB-81 fix typo
  TRILAB-82 fixed errors found in review
  Update windows test machine info
  TRILAB-81 Output error if filename length is greater then 255
  TRILAB-81 check for func success before using value
  TRILAB-81 Coverity fix
  Move options to root CMakeLists.txt
  TRILAB-34 fix required through testing
  TRILAB-34 add batch option (also patch2 from 10633)
  TRILAB-81 coverity fixes

1 files changed, 6 insertions, 2 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 28b1f00..594bf51 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -274,12 +274,15 @@ build_match_list (const char *objname1, trav_info_t *info1, const char *objname2
     int      cmp;
     trav_table_t *table = NULL;
     size_t   idx;
+    int      ret_value = 0;
 
     h5difftrace("build_match_list start\n");
     /* init */
     trav_table_init(&table);
-    if (table == NULL)
-        H5TOOLS_INFO(H5E_tools_min_id_g, "Cannot create tarverse table");
+    if (table == NULL) {
+        H5TOOLS_INFO(H5E_tools_min_id_g, "Cannot create traverse table");
+        HGOTO_DONE(-1);
+    }
     /*
      * This is necessary for the case that given objects are group and
      * have different names (ex: obj1 is /grp1 and obj2 is /grp5).
@@ -367,6 +370,7 @@ build_match_list (const char *objname1, trav_info_t *info1, const char *objname2
 
     free_exclude_path_list (opts);
 
+done:
     *table_out = table;
     h5difftrace("build_match_list finish\n");
 }