[svn-r8892] Purpose:

    Code cleanup

Description:
    Clean up a bunch of warnings and bring new code better inline with current
library coding practice.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require h5committest

Misc. update:

1 files changed, 6 insertions, 6 deletions

diff --git a/test/titerate.c b/test/titerate.c
index 652771a..b883ba3 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -756,7 +756,7 @@ static void test_grp_memb_funcs(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Sort the dataset names */
-    qsort(dnames,NDATASETS+2,sizeof(char *),iter_strcmp);
+    HDqsort(dnames,NDATASETS+2,sizeof(char *),iter_strcmp);
 
     /* Iterate through the datasets in the root group in various ways */
     file=H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
@@ -779,7 +779,7 @@ static void test_grp_memb_funcs(void)
         name_len = H5Gget_objname_by_idx(root_group, (hsize_t)i, NULL, NAMELEN);
         CHECK(name_len, FAIL, "H5Gget_objname_by_idx");
         
-        ret = (herr_t)H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, name_len+1);
+        ret = (herr_t)H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, (size_t)(name_len+1));
         CHECK(ret, FAIL, "H5Gget_objname_by_idx");
 
         /* Double-check that the length is the same */
@@ -841,7 +841,7 @@ static void test_links(void)
     ssize_t name_len;       /* Length of object's name */
     herr_t ret;		    /* Generic return value */
     hid_t    gid, gid1;
-    int i;
+    hsize_t i;
     H5G_obj_t obj_type;     /* Type of object */
     hsize_t   nobjs;        /* Number of objects */
 
@@ -873,10 +873,10 @@ static void test_links(void)
     /* Test these two functions, H5Gget_num_objs and H5Gget_objname_by_idx */
     for(i=0; i<nobjs; i++) {
         /* Get object name */
-        name_len = H5Gget_objname_by_idx(gid, (hsize_t)i, obj_name, NAMELEN);
+        name_len = H5Gget_objname_by_idx(gid, i, obj_name, NAMELEN);
         CHECK(name_len, FAIL, "H5Gget_objname_by_idx");
         
-        obj_type = H5Gget_objtype_by_idx(gid, (hsize_t)i);
+        obj_type = H5Gget_objtype_by_idx(gid, i);
         CHECK(obj_type, H5G_UNKNOWN, "H5Gget_objtype_by_idx");
 
         if(!HDstrcmp(obj_name, "g1.1"))
@@ -898,7 +898,7 @@ static void test_links(void)
     ret=H5Fclose(file);
     CHECK(ret, FAIL, "H5Fclose");
 } /* test_links() */
-    
+
 /****************************************************************
 **
 **  test_iterate(): Main iteration testing routine.