diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
commit | c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b (patch) | |
tree | a1e316063fb77793ab94ad890f33eb99d0740fc9 /src/H5trace.c | |
parent | 9e9f96879d760850794a191988a205fbf1a3957d (diff) | |
download | hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.zip hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.gz hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.bz2 |
[svn-r15300] Description:
Bring revisions 15210:15289 from the trunk into the metadata journaling branch.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5trace.c')
-rw-r--r-- | src/H5trace.c | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/src/H5trace.c b/src/H5trace.c index 926a590..4a42f0b 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -319,6 +319,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5D_ALLOC_TIME_INCR: fprintf (out, "H5D_ALLOC_TIME_INCR"); break; + default: + fprintf (out, "%ld", (long)alloc_time); + break; } } break; @@ -368,6 +371,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5D_FILL_TIME_IFSET: fprintf (out, "H5D_FILL_TIME_IFSET"); break; + default: + fprintf (out, "%ld", (long)fill_time); + break; } } break; @@ -394,6 +400,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5D_FILL_VALUE_USER_DEFINED: fprintf (out, "H5D_FILL_VALUE_USER_DEFINED"); break; + default: + fprintf (out, "%ld", (long)fill_value); + break; } } break; @@ -619,6 +628,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5F_CLOSE_STRONG: fprintf(out, "H5F_CLOSE_STRONG"); break; + default: + fprintf(out, "%ld", (long)degree); + break; } } break; @@ -643,6 +655,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) fprintf(out, "H5F_SCOPE_DOWN " "/*FOR INTERNAL USE ONLY!*/"); break; + default: + fprintf(out, "%ld", (long)scope); + break; } } break; @@ -663,6 +678,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5F_LIBVER_LATEST: fprintf(out, "H5F_LIBVER_LATEST"); break; + default: + fprintf(out, "%ld", (long)libver_vers); + break; } } break; @@ -928,7 +946,7 @@ H5_trace (const double *returning, const char *func, const char *type, ...) /* Save the rank of simple data spaces for arrays */ /* This may generate recursive call to the library... -QAK */ { - H5S_t *space = H5I_object(obj); + H5S_t *space = (H5S_t *)H5I_object(obj); if (H5S_SIMPLE==H5S_GET_EXTENT_TYPE(space)) { asize[argno] = H5S_GET_EXTENT_NDIMS(space); } @@ -997,6 +1015,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5_INDEX_N: fprintf(out, "H5_INDEX_N"); break; + default: + fprintf(out, "%ld", (long)idx_type); + break; } /* end switch */ } /* end else */ break; @@ -1026,6 +1047,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5_ITER_N: fprintf(out, "H5_ITER_N"); break; + default: + fprintf(out, "%ld", (long)order); + break; } /* end switch */ } /* end else */ break; @@ -1169,6 +1193,12 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5L_TYPE_SOFT: fprintf(out, "H5L_TYPE_SOFT"); break; + case H5L_TYPE_EXTERNAL: + fprintf(out, "H5L_TYPE_EXTERNAL"); + break; + case H5L_TYPE_MAX: + fprintf(out, "H5L_TYPE_MAX"); + break; default: fprintf(out, "%ld", (long)link_type); break; @@ -1286,6 +1316,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) else { H5O_type_t objtype = va_arg(ap, H5O_type_t); /*lint !e64 Type mismatch not really occuring */ switch(objtype) { + case H5O_TYPE_UNKNOWN: + fprintf(out, "H5O_TYPE_UNKNOWN"); + break; case H5O_TYPE_GROUP: fprintf(out, "H5O_TYPE_GROUP"); break; @@ -1295,6 +1328,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5O_TYPE_NAMED_DATATYPE: fprintf(out, "H5O_TYPE_NAMED_DATATYPE"); break; + case H5O_TYPE_NTYPES: + fprintf(out, "H5O_TYPE_TYPES"); + break; default: fprintf(out, "BADTYPE(%ld)", (long)objtype); break; @@ -1317,13 +1353,13 @@ H5_trace (const double *returning, const char *func, const char *type, ...) } } else { hid_t pclass_id = va_arg (ap, hid_t); - char *class_name=NULL; + char *class_name = NULL; H5P_genclass_t *pclass; /* Get the class name and print it */ /* This may generate recursive call to the library... -QAK */ - if(NULL != (pclass = H5I_object(pclass_id)) && - (class_name=H5P_get_class_name(pclass))!=NULL) { + if(NULL != (pclass = (H5P_genclass_t *)H5I_object(pclass_id)) && + (class_name = H5P_get_class_name(pclass))!=NULL) { fprintf (out, class_name); H5MM_xfree(class_name); } /* end if */ |