[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

1 files changed, 4 insertions, 26 deletions

diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index 6c02e92..04b856f 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -248,9 +248,7 @@ int h5repack_verify(const char *fname,
   {
    char* name=travt->objs[i].name;
 
-   switch ( travt->objs[i].type )
-   {
-   case H5G_DATASET:
+   if ( travt->objs[i].type == H5TRAV_TYPE_DATASET) {
 
  /*-------------------------------------------------------------------------
   * open
@@ -296,11 +294,7 @@ int h5repack_verify(const char *fname,
      goto error;
     if (H5Dclose(dset_id)<0)
      goto error;
-
-    break;
-   default:
-    break;
-   } /* switch */
+   } /* if */
 
   } /* i */
 
@@ -402,20 +396,7 @@ int h5repack_cmpdcpl(const char *fname1,
 
  for ( i=0; i < travt1->nobjs; i++)
  {
-  switch ( travt1->objs[i].type )
-  {
-/*-------------------------------------------------------------------------
- * nothing to do for groups, links and types
- *-------------------------------------------------------------------------
- */
-  default:
-   break;
-
-/*-------------------------------------------------------------------------
- * H5G_DATASET
- *-------------------------------------------------------------------------
- */
-  case H5G_DATASET:
+  if ( travt1->objs[i].type == H5TRAV_TYPE_DATASET) {
    if ((dset1=H5Dopen(fid1,travt1->objs[i].name))<0)
     goto error;
    if ((dset2=H5Dopen(fid2,travt1->objs[i].name))<0)
@@ -450,10 +431,7 @@ int h5repack_cmpdcpl(const char *fname1,
     goto error;
    if (H5Dclose(dset2)<0)
     goto error;
-
-   break;
-
-  } /*switch*/
+  } /*if*/
  } /*i*/
 
 /*-------------------------------------------------------------------------