[svn-r12940] Description:

    Add some more types to tracing script and regenerate TRACE macros, etc.

Tested on:
    Linux/32 2.4 (heping)

8 files changed, 177 insertions, 100 deletions

diff --git a/src/H5Edefin.h b/src/H5Edefin.h
index e99fe67..f54228e 100644
--- a/src/H5Edefin.h
+++ b/src/H5Edefin.h
@@ -182,13 +182,6 @@ hid_t H5E_CANTNEXT_g       = FAIL;      /* Can't move to next iterator location
 hid_t H5E_BADSELECT_g      = FAIL;      /* Invalid selection */
 hid_t H5E_CANTCOMPARE_g    = FAIL;      /* Can't compare objects */
 
-/* Argument errors */
-hid_t H5E_UNINITIALIZED_g  = FAIL;      /* Information is uinitialized */
-hid_t H5E_UNSUPPORTED_g    = FAIL;      /* Feature is unsupported */
-hid_t H5E_BADTYPE_g        = FAIL;      /* Inappropriate type */
-hid_t H5E_BADRANGE_g       = FAIL;      /* Out of range */
-hid_t H5E_BADVALUE_g       = FAIL;      /* Bad value */
-
 /* B-tree related errors */
 hid_t H5E_NOTFOUND_g       = FAIL;      /* Object not found */
 hid_t H5E_EXISTS_g         = FAIL;      /* Object already exists */
@@ -202,6 +195,13 @@ hid_t H5E_CANTLIST_g       = FAIL;      /* Unable to list node */
 hid_t H5E_CANTMODIFY_g     = FAIL;      /* Unable to modify record */
 hid_t H5E_CANTREMOVE_g     = FAIL;      /* Unable to remove object */
 
+/* Argument errors */
+hid_t H5E_UNINITIALIZED_g  = FAIL;      /* Information is uinitialized */
+hid_t H5E_UNSUPPORTED_g    = FAIL;      /* Feature is unsupported */
+hid_t H5E_BADTYPE_g        = FAIL;      /* Inappropriate type */
+hid_t H5E_BADRANGE_g       = FAIL;      /* Out of range */
+hid_t H5E_BADVALUE_g       = FAIL;      /* Bad value */
+
 /* Datatype conversion errors */
 hid_t H5E_CANTCONVERT_g    = FAIL;      /* Can't convert datatypes */
 hid_t H5E_BADSIZE_g        = FAIL;      /* Bad size for object */
diff --git a/src/H5Einit.h b/src/H5Einit.h
index a96f798..2da01ba 100644
--- a/src/H5Einit.h
+++ b/src/H5Einit.h
@@ -688,33 +688,6 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects"))==NULL)
 if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
-/* Argument errors */
-assert(H5E_UNINITIALIZED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_UNSUPPORTED_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADTYPE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADRANGE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-assert(H5E_BADVALUE_g==(-1));
-if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
-if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
 /* B-tree related errors */
 assert(H5E_NOTFOUND_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Object not found"))==NULL)
@@ -772,6 +745,33 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to remove object"))==NULL)
 if((H5E_CANTREMOVE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
     HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
 
+/* Argument errors */
+assert(H5E_UNINITIALIZED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_UNSUPPORTED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADTYPE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADRANGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADVALUE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
 /* Datatype conversion errors */
 assert(H5E_CANTCONVERT_g==(-1));
 if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes"))==NULL)
diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h
index 393b6f4..7c517cf 100644
--- a/src/H5Epubgen.h
+++ b/src/H5Epubgen.h
@@ -312,18 +312,6 @@ H5_DLLVAR hid_t H5E_CANTNEXT_g;      /* Can't move to next iterator location */
 H5_DLLVAR hid_t H5E_BADSELECT_g;     /* Invalid selection */
 H5_DLLVAR hid_t H5E_CANTCOMPARE_g;   /* Can't compare objects */
 
-/* Argument errors */
-#define H5E_UNINITIALIZED    (H5OPEN H5E_UNINITIALIZED_g)
-#define H5E_UNSUPPORTED      (H5OPEN H5E_UNSUPPORTED_g)
-#define H5E_BADTYPE          (H5OPEN H5E_BADTYPE_g)
-#define H5E_BADRANGE         (H5OPEN H5E_BADRANGE_g)
-#define H5E_BADVALUE         (H5OPEN H5E_BADVALUE_g)
-H5_DLLVAR hid_t H5E_UNINITIALIZED_g; /* Information is uinitialized */
-H5_DLLVAR hid_t H5E_UNSUPPORTED_g;   /* Feature is unsupported */
-H5_DLLVAR hid_t H5E_BADTYPE_g;       /* Inappropriate type */
-H5_DLLVAR hid_t H5E_BADRANGE_g;      /* Out of range */
-H5_DLLVAR hid_t H5E_BADVALUE_g;      /* Bad value */
-
 /* B-tree related errors */
 #define H5E_NOTFOUND         (H5OPEN H5E_NOTFOUND_g)
 #define H5E_EXISTS           (H5OPEN H5E_EXISTS_g)
@@ -348,6 +336,18 @@ H5_DLLVAR hid_t H5E_CANTLIST_g;      /* Unable to list node */
 H5_DLLVAR hid_t H5E_CANTMODIFY_g;    /* Unable to modify record */
 H5_DLLVAR hid_t H5E_CANTREMOVE_g;    /* Unable to remove object */
 
+/* Argument errors */
+#define H5E_UNINITIALIZED    (H5OPEN H5E_UNINITIALIZED_g)
+#define H5E_UNSUPPORTED      (H5OPEN H5E_UNSUPPORTED_g)
+#define H5E_BADTYPE          (H5OPEN H5E_BADTYPE_g)
+#define H5E_BADRANGE         (H5OPEN H5E_BADRANGE_g)
+#define H5E_BADVALUE         (H5OPEN H5E_BADVALUE_g)
+H5_DLLVAR hid_t H5E_UNINITIALIZED_g; /* Information is uinitialized */
+H5_DLLVAR hid_t H5E_UNSUPPORTED_g;   /* Feature is unsupported */
+H5_DLLVAR hid_t H5E_BADTYPE_g;       /* Inappropriate type */
+H5_DLLVAR hid_t H5E_BADRANGE_g;      /* Out of range */
+H5_DLLVAR hid_t H5E_BADVALUE_g;      /* Bad value */
+
 /* Datatype conversion errors */
 #define H5E_CANTCONVERT      (H5OPEN H5E_CANTCONVERT_g)
 #define H5E_BADSIZE          (H5OPEN H5E_BADSIZE_g)
diff --git a/src/H5Eterm.h b/src/H5Eterm.h
index 3825203..a188ab4 100644
--- a/src/H5Eterm.h
+++ b/src/H5Eterm.h
@@ -184,13 +184,6 @@ H5E_CANTNEXT_g=
 H5E_BADSELECT_g=    
 H5E_CANTCOMPARE_g=
 
-/* Argument errors */    
-H5E_UNINITIALIZED_g=    
-H5E_UNSUPPORTED_g=    
-H5E_BADTYPE_g=    
-H5E_BADRANGE_g=    
-H5E_BADVALUE_g=
-
 /* B-tree related errors */    
 H5E_NOTFOUND_g=    
 H5E_EXISTS_g=    
@@ -204,6 +197,13 @@ H5E_CANTLIST_g=
 H5E_CANTMODIFY_g=    
 H5E_CANTREMOVE_g=
 
+/* Argument errors */    
+H5E_UNINITIALIZED_g=    
+H5E_UNSUPPORTED_g=    
+H5E_BADTYPE_g=    
+H5E_BADRANGE_g=    
+H5E_BADVALUE_g=
+
 /* Datatype conversion errors */    
 H5E_CANTCONVERT_g=    
 H5E_BADSIZE_g= (-1);
diff --git a/src/H5L.c b/src/H5L.c
index b09ab92..b9306be 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -695,6 +695,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name,
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Ldelete_by_idx, FAIL)
+    H5TRACE6("e","isLiIohi",loc_id,group_name,idx_type,order,n,lapl_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -796,6 +797,8 @@ H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5L_index_t idx_type,
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Lget_val_by_idx, FAIL)
+    H5TRACE8("e","isLiIohxzi",loc_id,group_name,idx_type,order,n,buf,size,
+             lapl_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc))
@@ -888,6 +891,8 @@ H5Lget_info_by_idx(hid_t loc_id, const char *group_name,
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Lget_info_by_idx, FAIL)
+    H5TRACE7("e","isLiIohxi",loc_id,group_name,idx_type,order,n,linkbuf,
+             lapl_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc))
@@ -1065,6 +1070,8 @@ H5Lget_name_by_idx(hid_t loc_id, const char *group_name,
     ssize_t ret_value;          /* Return value */
 
     FUNC_ENTER_API(H5Lget_name_by_idx, FAIL)
+    H5TRACE8("Zs","isLiIohxzi",loc_id,group_name,idx_type,order,n,name,size,
+             lapl_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc))
@@ -1123,6 +1130,8 @@ H5Literate(hid_t loc_id, const char *group_name,
     herr_t ret_value;           /* Return value */
 
     FUNC_ENTER_API(H5Literate, FAIL)
+    H5TRACE8("e","isLiIo*hxxi",loc_id,group_name,idx_type,order,idx_p,op,
+             op_data,lapl_id);
 
     /* Check arguments */
     if(!group_name || !*group_name)
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 84ac73c..5296941 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -557,13 +557,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_data_transform(hid_t plist_id, const char* expression)
+H5Pset_data_transform(hid_t plist_id, const char *expression)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     H5Z_data_xform_t *data_xform_prop = NULL;    /* New data xform property */
     herr_t ret_value = SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pset_data_transform, FAIL)
+    H5TRACE2("e","is",plist_id,expression);
 
     /* Check arguments */
     if(expression == NULL)
@@ -620,7 +621,7 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5Pget_data_transform(hid_t plist_id, char* expression /*out*/, size_t size)
+H5Pget_data_transform(hid_t plist_id, char *expression /*out*/, size_t size)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     H5Z_data_xform_t *data_xform_prop = NULL;    /* New data xform property */
@@ -629,6 +630,7 @@ H5Pget_data_transform(hid_t plist_id, char* expression /*out*/, size_t size)
     ssize_t 	ret_value;   /* return value */
 
     FUNC_ENTER_API(H5Pget_data_transform, FAIL)
+    H5TRACE3("Zs","ixz",plist_id,expression,size);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
diff --git a/src/H5trace.c b/src/H5trace.c
index 1d2e8c2..cb31f87 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -605,32 +605,6 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
 
 	case 'G':
 	    switch(type[1]) {
-                case 'l':
-                    if(ptr) {
-                        if(vp)
-                            fprintf (out, "0x%lx", (unsigned long)vp);
-                        else
-                            fprintf(out, "NULL");
-                    } else {
-                        H5L_type_t link_type = va_arg(ap, H5L_type_t); /*lint !e64 Type mismatch not really occuring */
-
-                        switch(link_type) {
-                            case H5L_TYPE_ERROR:
-                                fprintf(out, "H5L_TYPE_ERROR");
-                                break;
-                            case H5L_TYPE_HARD:
-                                fprintf(out, "H5L_TYPE_HARD");
-                                break;
-                            case H5L_TYPE_SOFT:
-                                fprintf(out, "H5L_TYPE_SOFT");
-                                break;
-                            default:
-                                fprintf(out, "%ld", (long)link_type);
-                                break;
-                        }
-                    }
-                    break;
-
                 case 'o':
                     if(ptr) {
                         if(vp)
@@ -921,6 +895,35 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
 
 	case 'I':
 	    switch (type[1]) {
+            case 'o':
+		if (ptr) {
+		    if (vp)
+			fprintf (out, "0x%lx", (unsigned long)vp);
+		    else
+			fprintf(out, "NULL");
+		} /* end if */
+                else {
+		    H5_iter_order_t order = va_arg (ap, H5_iter_order_t); /*lint !e64 Type mismatch not really occuring */
+		    switch(order) {
+                        case H5_ITER_UNKNOWN:
+                            fprintf(out, "H5_ITER_UNKNOWN");
+                            break;
+                        case H5_ITER_INC:
+                            fprintf(out, "H5_ITER_INC");
+                            break;
+                        case H5_ITER_DEC:
+                            fprintf(out, "H5_ITER_DEC");
+                            break;
+                        case H5_ITER_NATIVE:
+                            fprintf(out, "H5_ITER_NATIVE");
+                            break;
+                        case H5_ITER_N:
+                            fprintf(out, "H5_ITER_N");
+                            break;
+		    } /* end switch */
+		} /* end else */
+		break;
+
 	    case 's':
 		if (ptr) {
 		    if (vp) {
@@ -1036,6 +1039,67 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
 	    }
 	    break;
 
+	case 'L':
+	    switch(type[1]) {
+                case 'i':
+                    if(ptr) {
+                        if(vp)
+                            fprintf (out, "0x%lx", (unsigned long)vp);
+                        else
+                            fprintf(out, "NULL");
+                    } else {
+                        H5L_index_t idx_type = va_arg(ap, H5L_index_t); /*lint !e64 Type mismatch not really occuring */
+
+                        switch(idx_type) {
+                            case H5L_INDEX_UNKNOWN:
+                                fprintf(out, "H5L_INDEX_UNKNOWN");
+                                break;
+                            case H5L_INDEX_NAME:
+                                fprintf(out, "H5L_INDEX_NAME");
+                                break;
+                            case H5L_INDEX_CRT_ORDER:
+                                fprintf(out, "H5L_INDEX_CRT_ORDER");
+                                break;
+                            case H5L_INDEX_N:
+                                fprintf(out, "H5L_INDEX_N");
+                                break;
+                        }
+                    }
+                    break;
+
+                case 'l':
+                    if(ptr) {
+                        if(vp)
+                            fprintf (out, "0x%lx", (unsigned long)vp);
+                        else
+                            fprintf(out, "NULL");
+                    } /* end if */
+                    else {
+                        H5L_type_t link_type = va_arg(ap, H5L_type_t); /*lint !e64 Type mismatch not really occuring */
+
+                        switch(link_type) {
+                            case H5L_TYPE_ERROR:
+                                fprintf(out, "H5L_TYPE_ERROR");
+                                break;
+                            case H5L_TYPE_HARD:
+                                fprintf(out, "H5L_TYPE_HARD");
+                                break;
+                            case H5L_TYPE_SOFT:
+                                fprintf(out, "H5L_TYPE_SOFT");
+                                break;
+                            default:
+                                fprintf(out, "%ld", (long)link_type);
+                                break;
+                        } /* end switch */
+                    } /* end else */
+                    break;
+
+                default:
+                    fprintf(out, "BADTYPE(G%c)", type[1]);
+                    goto error;
+	    }
+	    break;
+
 	case 'M':
 	    switch (type[1]) {
 	    case 'c':
diff --git a/src/Makefile.in b/src/Makefile.in

path: root/Tests/RunCMake/CommandLine/E_md5sum-stdout.txt

275876e34cf609db118f3d84b799a790  ../dummy