[svn-r6142] Purpose:

    Code cleanup

Description:
    Clean up warnings with gcc 3.2.1

Platforms tested:
    FreeBSD 4.7 (sleipnir) w/C++, changes too small for triple check

2 files changed, 8 insertions, 5 deletions

diff --git a/src/H5G.c b/src/H5G.c
index 8980ee2..d6d4ea1 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -2467,10 +2467,13 @@ H5G_get_objname_by_idx(H5G_t *grp, hsize_t idx, char* name, size_t size)
     
     ret_value = HDstrlen(udata.name);
     if(name && size>0) {
-        HDstrncpy(name, udata.name, MIN(ret_value+1,size-1));
-        if(ret_value >= size)
+        HDstrncpy(name, udata.name, MIN((size_t)(ret_value+1),size-1));
+        if((size_t)ret_value >= size)
             name[size-1]='\0';
     }
+
+    /* Free the duplicated name */
+    H5MM_xfree(udata.name);
     
 done:
     FUNC_LEAVE(ret_value);
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 8671a43..98fde41 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -1181,7 +1181,7 @@ H5G_node_name(H5F_t *f, void UNUSED *_lt_key, haddr_t addr,
     H5G_bt_ud3_t	*bt_udata = (H5G_bt_ud3_t *)_udata;
     size_t		name_off;
     hsize_t             loc_idx;
-    char		*name;   
+    const char		*name;   
     H5G_node_t		*sn = NULL;
     H5B_iterate_t	ret_value = H5B_ITER_CONT;
 
@@ -1202,9 +1202,9 @@ H5G_node_name(H5F_t *f, void UNUSED *_lt_key, haddr_t addr,
     if(bt_udata->idx >= bt_udata->num_objs && bt_udata->idx < (bt_udata->num_objs+sn->nsyms)) {
             loc_idx = bt_udata->idx - bt_udata->num_objs; 
             name_off = sn->entry[loc_idx].name_off;  
-            name = (char*)H5HL_peek (f, bt_udata->group->ent.cache.stab.heap_addr, name_off);
+            name = (const char*)H5HL_peek (f, bt_udata->group->ent.cache.stab.heap_addr, name_off);
             assert (name);
-            bt_udata->name = HDstrdup (name);
+            bt_udata->name = H5MM_strdup (name);
             HGOTO_DONE(H5B_ITER_STOP);
     }