[svn-r8760] Purpose:

    Code cleanup & small bug fix

Description:
    Regenerate dependency files

    Add htri_t as separate type from hbool_t for code tracing purposes.

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

15 files changed, 128 insertions, 18 deletions

diff --git a/bin/trace b/bin/trace
index 54b7b47..7341fc1 100755
--- a/bin/trace
+++ b/bin/trace
@@ -16,7 +16,6 @@ $Source = "";
 #
 %TypeString = ("haddr_t"                    => "a",
                "hbool_t"                    => "b",
-               "htri_t"                     => "b",
                "double"                     => "d",
                "H5D_alloc_time_t"           => "Da",
                "H5D_fill_time_t"            => "Df",
@@ -56,6 +55,7 @@ $Source = "";
                "H5S_class_t"                => "Sc",
                "H5S_seloper_t"              => "Ss",
                "H5S_sel_type"               => "St",
+               "htri_t"                     => "t",
                "H5T_cset_t",                => "Tc",
                "H5T_direction_t",           => "Td",
                "H5T_norm_t"                 => "Tn",
@@ -87,6 +87,7 @@ $Source = "";
                "H5P_prp_set_func_t"         => "x",
                "H5T_cdata_t**"              => "x",
                "H5T_conv_t"                 => "x",
+               "H5T_conv_except_func_t"     => "x",
                "H5T_overflow_t"             => "x",
                "H5Z_func_t"                 => "x",
                "H5Z_filter_func_t"          => "x",
diff --git a/src/Dependencies b/src/Dependencies
index a157d98..5882033 100644
--- a/src/Dependencies
+++ b/src/Dependencies
@@ -3619,11 +3619,10 @@ H5Tinit.o: \
    ../../hdf5/src/H5Epublic.h \
    ../../hdf5/src/H5Epubgen.h \
    ../../hdf5/src/H5FLprivate.h \
-   ../../hdf5/src/H5MMprivate.h \
-   ../../hdf5/src/H5MMpublic.h \
    ../../hdf5/src/H5Tpkg.h \
    ../../hdf5/src/H5Tprivate.h \
    ../../hdf5/src/H5Tpublic.h \
+   ../../hdf5/src/H5MMpublic.h \
    ../../hdf5/src/H5Gprivate.h \
    ../../hdf5/src/H5Gpublic.h \
    ../../hdf5/src/H5Opublic.h \
diff --git a/src/H5.c b/src/H5.c
index b105721..dec226e 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -2890,6 +2890,21 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
 	    }
 	    break;
 
+	case 't':
+	    if (ptr) {
+		if (vp) {
+		    fprintf (out, "0x%lx", (unsigned long)vp);
+		} else {
+		    fprintf(out, "NULL");
+		}
+	    } else {
+		htri_t tri_var = va_arg (ap, htri_t);
+		if (tri_var>0) fprintf (out, "TRUE");
+		else if (!tri_var) fprintf (out, "FALSE");
+		else fprintf (out, "FAIL(%d)", (int)tri_var);
+	    }
+	    break;
+
 	case 'x':
 	    if (ptr) {
 		if (vp) {
diff --git a/src/H5F.c b/src/H5F.c
index a8f3f43..72c1265 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1351,7 +1351,7 @@ H5Fis_hdf5(const char *name)
     htri_t	ret_value;
 
     FUNC_ENTER_API(H5Fis_hdf5, FAIL)
-    H5TRACE1("b","s",name);
+    H5TRACE1("t","s",name);
 
     /* Check args and all the boring stuff. */
     if (!name || !*name)
diff --git a/src/H5P.c b/src/H5P.c
index af10283..7d608c3 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -2942,7 +2942,7 @@ H5Pexist(hid_t id, const char *name)
     htri_t ret_value;           /* return value */
 
     FUNC_ENTER_API(H5Pexist, FAIL);
-    H5TRACE2("b","is",id,name);
+    H5TRACE2("t","is",id,name);
 
     /* Check arguments. */
     if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
@@ -3670,7 +3670,7 @@ H5Pequal(hid_t id1, hid_t id2)
     htri_t ret_value=FALSE;     /* return value */
 
     FUNC_ENTER_API(H5Pequal, FAIL);
-    H5TRACE2("b","ii",id1,id2);
+    H5TRACE2("t","ii",id1,id2);
 
     /* Check arguments. */
     if ((H5I_GENPROP_LST != H5I_get_type(id1) && H5I_GENPROP_CLS != H5I_get_type(id1))
@@ -3824,7 +3824,7 @@ H5Pisa_class(hid_t plist_id, hid_t pclass_id)
     htri_t ret_value;                   /* return value */
 
     FUNC_ENTER_API(H5Pisa_class, FAIL);
-    H5TRACE2("b","ii",plist_id,pclass_id);
+    H5TRACE2("t","ii",plist_id,pclass_id);
 
     /* Check arguments. */
     if (H5I_GENPROP_LST != H5I_get_type(plist_id))
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 1084ca3..fb5f9a9 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -942,7 +942,7 @@ H5Pall_filters_avail(hid_t plist_id)
     hbool_t ret_value=TRUE;     /* return value */
     
     FUNC_ENTER_API(H5Pall_filters_avail, UFAIL);
-    H5TRACE1("b","i",plist_id);
+    H5TRACE1("t","i",plist_id);
     
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE)))
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index fc84cdf..3994d98 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -462,7 +462,7 @@ H5Pget_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t *op, void **operate_d
     herr_t              ret_value=SUCCEED;   /* return value */
     
     FUNC_ENTER_API(H5Pget_type_conv_cb, FAIL);
-    H5TRACE3("e","ixx",plist_id,op,operate_data);
+    H5TRACE3("e","i*xx",plist_id,op,operate_data);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
diff --git a/src/H5S.c b/src/H5S.c
index c01ed89..fe54afb 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -1226,7 +1226,7 @@ H5Sis_simple(hid_t space_id)
     htri_t		    ret_value;
 
     FUNC_ENTER_API(H5Sis_simple, FAIL);
-    H5TRACE1("b","i",space_id);
+    H5TRACE1("t","i",space_id);
 
     /* Check args and all the boring stuff. */
     if ((space = H5I_object_verify(space_id,H5I_DATASPACE)) == NULL)
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 56ab3b4..61a1f5d 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -376,7 +376,7 @@ H5Sselect_valid(hid_t spaceid)
     htri_t ret_value;     /* return value */
 
     FUNC_ENTER_API(H5Sselect_valid, 0);
-    H5TRACE1("b","i",spaceid);
+    H5TRACE1("t","i",spaceid);
 
     /* Check args */
     if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE)))
diff --git a/src/H5T.c b/src/H5T.c
index de6461c..497c868 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1638,7 +1638,7 @@ H5Tequal(hid_t type1_id, hid_t type2_id)
     htri_t		ret_value;
 
     FUNC_ENTER_API(H5Tequal, FAIL);
-    H5TRACE2("b","ii",type1_id,type2_id);
+    H5TRACE2("t","ii",type1_id,type2_id);
 
     /* check args */
     if (NULL == (dt1 = H5I_object_verify(type1_id,H5I_DATATYPE)) ||
@@ -1797,7 +1797,7 @@ H5Tdetect_class(hid_t type, H5T_class_t cls)
     htri_t      ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Tdetect_class, FAIL);
-    H5TRACE2("b","iTt",type,cls);
+    H5TRACE2("t","iTt",type,cls);
     
     /* Check args */
     if (NULL == (dt = H5I_object_verify(type,H5I_DATATYPE)))
@@ -1895,7 +1895,7 @@ H5Tis_variable_str(hid_t dtype_id)
     htri_t      ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Tis_variable_str, FAIL);
-    H5TRACE1("b","i",dtype_id);
+    H5TRACE1("t","i",dtype_id);
     
     /* Check args */
     if (NULL == (dt = H5I_object_verify(dtype_id,H5I_DATATYPE)))
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index d174aec..15f3fb5 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -205,7 +205,7 @@ H5Tcommitted(hid_t type_id)
     htri_t      ret_value;       /* Return value */
     
     FUNC_ENTER_API(H5Tcommitted, FAIL);
-    H5TRACE1("b","i",type_id);
+    H5TRACE1("t","i",type_id);
 
     /* Check arguments */
     if (NULL==(type=H5I_object_verify(type_id,H5I_DATATYPE)))
diff --git a/src/H5Z.c b/src/H5Z.c
index 8d4f267..bf3998f 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -407,7 +407,7 @@ H5Zfilter_avail(H5Z_filter_t id)
     htri_t ret_value=FALSE;     /* Return value */
 
     FUNC_ENTER_API(H5Zfilter_avail, FAIL)
-    H5TRACE1("b","Zf",id);
+    H5TRACE1("t","Zf",id);
 
     /* Check args */
     if(id<0 || id>H5Z_FILTER_MAX)
diff --git a/test/Dependencies b/test/Dependencies
index 872bc6d..2ee6eb3 100644
--- a/test/Dependencies
+++ b/test/Dependencies
@@ -1965,6 +1965,53 @@ tmisc.o: \
    ../../hdf5/src/H5Zprivate.h \
    ../../hdf5/src/H5Sprivate.h \
    ../../hdf5/src/H5Pprivate.h
+tid.o: \
+   ../../hdf5/test/tid.c \
+   ../../hdf5/test/testhdf5.h \
+   ../../hdf5/src/H5private.h \
+   ../../hdf5/src/H5public.h \
+   ../src/H5pubconf.h \
+   ../../hdf5/src/H5api_adpt.h \
+   ../../hdf5/src/H5MPprivate.h \
+   ../../hdf5/src/H5FSprivate.h \
+   ../../hdf5/src/H5Eprivate.h \
+   ../../hdf5/src/H5Epublic.h \
+   ../../hdf5/src/H5Ipublic.h \
+   ../../hdf5/src/H5Epubgen.h \
+   ../../hdf5/test/h5test.h \
+   ../../hdf5/src/hdf5.h \
+   ../../hdf5/src/H5Apublic.h \
+   ../../hdf5/src/H5ACpublic.h \
+   ../../hdf5/src/H5Bpublic.h \
+   ../../hdf5/src/H5Dpublic.h \
+   ../../hdf5/src/H5Fpublic.h \
+   ../../hdf5/src/H5FDpublic.h \
+   ../../hdf5/src/H5FPpublic.h \
+   ../../hdf5/src/H5Gpublic.h \
+   ../../hdf5/src/H5Opublic.h \
+   ../../hdf5/src/H5HGpublic.h \
+   ../../hdf5/src/H5HLpublic.h \
+   ../../hdf5/src/H5MMpublic.h \
+   ../../hdf5/src/H5Ppublic.h \
+   ../../hdf5/src/H5Tpublic.h \
+   ../../hdf5/src/H5Zpublic.h \
+   ../../hdf5/src/H5Rpublic.h \
+   ../../hdf5/src/H5Spublic.h \
+   ../../hdf5/src/H5FDcore.h \
+   ../../hdf5/src/H5FDfamily.h \
+   ../../hdf5/src/H5FDgass.h \
+   ../../hdf5/src/H5FDlog.h \
+   ../../hdf5/src/H5FDmpi.h \
+   ../../hdf5/src/H5FDfphdf5.h \
+   ../../hdf5/src/H5FDmpio.h \
+   ../../hdf5/src/H5FDmpiposix.h \
+   ../../hdf5/src/H5FDmulti.h \
+   ../../hdf5/src/H5FDsec2.h \
+   ../../hdf5/src/H5FDsrb.h \
+   ../../hdf5/src/H5FDstdio.h \
+   ../../hdf5/src/H5FDstream.h \
+   ../../hdf5/src/H5Ipkg.h \
+   ../../hdf5/src/H5Iprivate.h
 unlink.o: \
    ../../hdf5/test/unlink.c \
    ../../hdf5/test/h5test.h \
diff --git a/tools/h5dump/Dependencies b/tools/h5dump/Dependencies
index 395983e..3265018 100644
--- a/tools/h5dump/Dependencies
+++ b/tools/h5dump/Dependencies
@@ -45,7 +45,9 @@ h5dump.o: \
    ../../../hdf5/src/H5MPprivate.h \
    ../../../hdf5/src/H5FSprivate.h \
    ../../../hdf5/tools/lib/h5tools.h \
-   ../../../hdf5/tools/lib/h5tools_utils.h
+   ../../../hdf5/tools/lib/h5tools_utils.h \
+   ../../../hdf5/tools/lib/h5tools_ref.h \
+   ../../../hdf5/tools/lib/h5trav.h
 h5dumpgentest.o: \
    ../../../hdf5/tools/h5dump/h5dumpgentest.c \
    ../../../hdf5/src/hdf5.h \
diff --git a/tools/lib/Dependencies b/tools/lib/Dependencies
index 1493c2f..7fb6bcb 100644
--- a/tools/lib/Dependencies
+++ b/tools/lib/Dependencies
@@ -89,7 +89,8 @@ h5tools_str.o: \
    ../../../hdf5/src/H5FDsrb.h \
    ../../../hdf5/src/H5FDstdio.h \
    ../../../hdf5/src/H5FDstream.h \
-   ../../../hdf5/tools/lib/h5tools_str.h
+   ../../../hdf5/tools/lib/h5tools_str.h \
+   ../../../hdf5/tools/lib/h5tools_ref.h
 h5tools_utils.o: \
    ../../../hdf5/tools/lib/h5tools_utils.c \
    ../../../hdf5/tools/lib/h5tools_utils.h \
@@ -480,6 +481,51 @@ h5tools_filters.o: \
    ../../../hdf5/src/H5FDstdio.h \
    ../../../hdf5/src/H5FDstream.h \
    ../../../hdf5/tools/lib/h5tools.h
+h5tools_ref.o: \
+   ../../../hdf5/tools/lib/h5tools_ref.c \
+   ../../../hdf5/tools/lib/h5tools_ref.h \
+   ../../../hdf5/src/hdf5.h \
+   ../../../hdf5/src/H5public.h \
+   ../../src/H5pubconf.h \
+   ../../../hdf5/src/H5api_adpt.h \
+   ../../../hdf5/src/H5Apublic.h \
+   ../../../hdf5/src/H5Ipublic.h \
+   ../../../hdf5/src/H5ACpublic.h \
+   ../../../hdf5/src/H5Bpublic.h \
+   ../../../hdf5/src/H5Dpublic.h \
+   ../../../hdf5/src/H5Epublic.h \
+   ../../../hdf5/src/H5Epubgen.h \
+   ../../../hdf5/src/H5Fpublic.h \
+   ../../../hdf5/src/H5FDpublic.h \
+   ../../../hdf5/src/H5FPpublic.h \
+   ../../../hdf5/src/H5Gpublic.h \
+   ../../../hdf5/src/H5Opublic.h \
+   ../../../hdf5/src/H5HGpublic.h \
+   ../../../hdf5/src/H5HLpublic.h \
+   ../../../hdf5/src/H5MMpublic.h \
+   ../../../hdf5/src/H5Ppublic.h \
+   ../../../hdf5/src/H5Tpublic.h \
+   ../../../hdf5/src/H5Zpublic.h \
+   ../../../hdf5/src/H5Rpublic.h \
+   ../../../hdf5/src/H5Spublic.h \
+   ../../../hdf5/src/H5FDcore.h \
+   ../../../hdf5/src/H5FDfamily.h \
+   ../../../hdf5/src/H5FDgass.h \
+   ../../../hdf5/src/H5FDlog.h \
+   ../../../hdf5/src/H5FDmpi.h \
+   ../../../hdf5/src/H5FDfphdf5.h \
+   ../../../hdf5/src/H5FDmpio.h \
+   ../../../hdf5/src/H5FDmpiposix.h \
+   ../../../hdf5/src/H5FDmulti.h \
+   ../../../hdf5/src/H5FDsec2.h \
+   ../../../hdf5/src/H5FDsrb.h \
+   ../../../hdf5/src/H5FDstdio.h \
+   ../../../hdf5/src/H5FDstream.h \
+   ../../../hdf5/src/H5private.h \
+   ../../../hdf5/src/H5MPprivate.h \
+   ../../../hdf5/src/H5FSprivate.h \
+   ../../../hdf5/tools/lib/h5tools.h \
+   ../../../hdf5/tools/lib/h5tools_utils.h
 talign.o: \
    ../../../hdf5/tools/lib/talign.c \
    ../../../hdf5/src/hdf5.h \