[svn-r25014] Purpose:

    Merge of r24937 from the trunk
    Adds H5free_memory to the API. This function should be used to free
    memory allocated by the library (e.g., returned values from
    H5Tget_tag, H5Pget_class_name, etc.).

    This is mainly to help Windows applications deal with multiple CRT 
    instances, but can also be helpful when a debug memory manager is
    being used or when the HDF5 API is being wrapped for managed languages
    like Python and Java.

Tested on:
    32-bit LE linux (jam) with fortran and C++
    64-bit BE linux (ostrich)
    64-bit LE linux (koala)

2 files changed, 4 insertions, 4 deletions

diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 7492d8a..f11065c 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -2340,7 +2340,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
            h5tools_str_append(buffer, "OPAQUE_TAG \"%s\";", ttag);
            h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
            
-           HDfree(ttag);
+           H5free_memory(ttag);
         } 
         ctx->indent_level--;
 
@@ -2376,7 +2376,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
             }
             else
                 HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tget_member_type failed");
-            HDfree(mname);
+            H5free_memory(mname);
         }
         ctx->indent_level--;
 
@@ -2692,7 +2692,7 @@ CATCH
         /* Release resources */
         for(i = 0; i < nmembs; i++)
             if(name[i])
-                HDfree(name[i]);
+                H5free_memory(name[i]);
         HDfree(name);
     } /* end if */
 
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 9202925..d43fc33 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -991,7 +991,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         /* The name */
                         name = H5Tget_member_name(type, j);
                         h5tools_str_append(str, OPT(info->cmpd_name, ""), name);
-                        HDfree(name);
+                        H5free_memory(name);
 
                         /* The value */
                         offset = H5Tget_member_offset(type, j);