diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-25 22:18:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-25 22:18:33 (GMT) |
| commit | 68c01f91d94d1fa7a7cff198cb8daf6c89f05da7 (patch) | |
| tree | 8035fe4ed2f2a10855575c91969e4107af382d46 /src/H5trace.c | |
| parent | 02296972ec8a90ad50d89786755d0e953e95b455 (diff) | |
| download | hdf5-68c01f91d94d1fa7a7cff198cb8daf6c89f05da7.zip hdf5-68c01f91d94d1fa7a7cff198cb8daf6c89f05da7.tar.gz hdf5-68c01f91d94d1fa7a7cff198cb8daf6c89f05da7.tar.bz2 | |
[svn-r14154] Description:
Finish deprecating last H5G symbol (H5G_obj_t) - yay!
Lots of misc. library fixes to remove confusion between links and
objects. The tools could still use another pass, to remove h5trav_type_t type
and make the correct distinction between links & objects.
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 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'src/H5trace.c')
| -rw-r--r-- | src/H5trace.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/H5trace.c b/src/H5trace.c index 1c3b89d..2ad8222 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -655,6 +655,7 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case 'G': switch(type[1]) { +#ifndef H5_NO_DEPRECATED_SYMBOLS case 'o': if(ptr) { if(vp) @@ -668,34 +669,40 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5G_UNKNOWN: fprintf(out, "H5G_UNKNOWN"); break; - case H5G_LINK: - fprintf(out, "H5G_LINK"); - break; - case H5G_UDLINK: - fprintf(out, "H5G_UDLINK"); - break; + case H5G_GROUP: fprintf(out, "H5G_GROUP"); break; + case H5G_DATASET: fprintf(out, "H5G_DATASET"); break; + case H5G_TYPE: fprintf(out, "H5G_TYPE"); break; + + case H5G_LINK: + fprintf(out, "H5G_LINK"); + break; + + case H5G_UDLINK: + fprintf(out, "H5G_UDLINK"); + break; + case H5G_RESERVED_5: case H5G_RESERVED_6: case H5G_RESERVED_7: fprintf(out, "H5G_RESERVED(%ld)",(long)obj_type); break; + default: fprintf(out, "%ld", (long)obj_type); break; - } - } + } /* end switch */ + } /* end else */ break; -#ifndef H5_NO_DEPRECATED_SYMBOLS case 's': if(ptr) { if(vp) |