[svn-r19237] Description:

	Clean up misc. compiler warnings.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

1 files changed, 11 insertions, 16 deletions

diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c
index fcdfbd5..aa2e823 100644
--- a/tools/h5repack/h5repack_refs.c
+++ b/tools/h5repack/h5repack_refs.c
@@ -707,34 +707,29 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-
-static const char* MapIdToName(hid_t refobj_id,
-                               trav_table_t *travt)
+static const char*
+MapIdToName(hid_t refobj_id, trav_table_t *travt)
 {
-    unsigned int i;
+    unsigned int u;
     const char* ret = NULL;
-    H5O_info_t   ref_oinfo;     /* Stat for the refobj id */
 
     /* linear search */
-    for(i = 0; i < travt->nobjs; i++)
-    {
-        if(travt->objs[i].type == H5O_TYPE_DATASET || 
-           travt->objs[i].type == H5O_TYPE_GROUP ||
-           travt->objs[i].type == H5O_TYPE_NAMED_DATATYPE)
-        {
+    for(u = 0; u < travt->nobjs; u++) {
+        if(travt->objs[u].type == H5O_TYPE_DATASET || 
+                travt->objs[u].type == H5O_TYPE_GROUP ||
+                travt->objs[u].type == H5O_TYPE_NAMED_DATATYPE) {
             H5O_info_t   ref_oinfo;     /* Stat for the refobj id */
 
             /* obtain information to identify the referenced object uniquely */
             if(H5Oget_info(refobj_id, &ref_oinfo) < 0)
                 goto out;
 
-            if(ref_oinfo.addr == travt->objs[i].objno)
-            {
-                ret = travt->objs[i].name;
+            if(ref_oinfo.addr == travt->objs[u].objno) {
+                ret = travt->objs[u].name;
                 goto out;
-            }
+            } /* end if */
         }  /* end if */
-    } /* i */
+    } /* u */
 
 out:
     return ret;