[svn-r22287] Description:

    Clean up more FUNC_ENTER/FUNC_LEAVE macros and move H5D & H5T code toward
the final design (as exemplified by the H5EA & H5FA code).

Tested on:
    Mac OSX/64 10.7.3 (amazon) w/debug & parallel

3 files changed, 31 insertions, 32 deletions

diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 9188225..75f3c7e 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -2849,8 +2849,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     hsize_t          size;           /* size of external file   */
     hsize_t          storage_size;
     hsize_t       curr_pos = 0;        /* total data element position   */
-    hsize_t       elmt_counter = 0;/* counts the # elements printed.*/
-    haddr_t          ioffset;
     h5tools_str_t buffer;          /* string into which to render   */
 
     /* setup */
@@ -2860,7 +2858,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
     storage_size = H5Dget_storage_size(obj_id);
     nfilters = H5Pget_nfilters(dcpl_id);
-    ioffset = H5Dget_offset(obj_id);
     HDstrcpy(f_name,"\0");
 
     /*-------------------------------------------------------------------------
@@ -3043,6 +3040,8 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
             h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, 0, 0);
         }
         else {
+            haddr_t          ioffset;
+
             ctx->indent_level++;
 
             ctx->need_prefix = TRUE;
@@ -3063,6 +3062,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
             h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
             
             h5tools_str_reset(&buffer);
+            ioffset = H5Dget_offset(obj_id);
             h5tools_str_append(&buffer,"OFFSET "H5_PRINTF_HADDR_FMT, ioffset);
             h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, 0, 0);
 
@@ -3375,7 +3375,6 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info,
     size_t        buf_size = 0;
     size_t        ncols = 80;      /* available output width        */
     h5tools_str_t buffer;          /* string into which to render   */
-    hsize_t       elmt_counter = 0;/* counts the # elements printed.*/
     hsize_t       curr_pos = ctx->sm_pos;   /* total data element position   */
                                             /* pass to the prefix in h5tools_simple_prefix the total position
                                              * instead of the current stripmine position i; this is necessary
@@ -3429,7 +3428,6 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
 {
     h5tools_str_t buffer;          /* string into which to render   */
     size_t        ncols = 80;      /* available output width        */
-    hsize_t       elmt_counter = 0;/* counts the # elements printed.*/
     hsize_t       curr_pos = ctx->sm_pos;   /* total data element position   */
                                             /* pass to the prefix in h5tools_simple_prefix the total position
                                              * instead of the current stripmine position i; this is necessary
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index f24fbba..9df49cf 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -23,33 +23,34 @@
  *
  *-------------------------------------------------------------------------
  */
-#define H5A_PACKAGE    /*suppress error about including H5Apkg  */
-#define H5B2_PACKAGE    /*suppress error about including H5B2pkg  */
+#define H5A_PACKAGE     /*suppress error about including H5Apkg  */
+#define H5B2_PACKAGE    /*suppress error about including H5B2pkg */
 #define H5B2_TESTING    /*suppress warning about H5B2 testing funcs*/
-#define H5EA_PACKAGE    /*suppress error about including H5EApkg  */
+#define H5D_PACKAGE     /*suppress error about including H5Dpkg  */
+#define H5EA_PACKAGE    /*suppress error about including H5EApkg */
 #define H5EA_TESTING    /*suppress warning about H5EA testing funcs*/
-#define H5FA_PACKAGE    /*suppress error about including H5FApkg  */
+#define H5FA_PACKAGE    /*suppress error about including H5FApkg */
 #define H5FA_TESTING    /*suppress warning about H5FA testing funcs*/
-#define H5F_PACKAGE    /*suppress error about including H5Fpkg    */
-#define H5G_PACKAGE    /*suppress error about including H5Gpkg    */
-#define H5HF_PACKAGE    /*suppress error about including H5HFpkg  */
-#define H5O_PACKAGE    /*suppress error about including H5Opkg    */
-#define H5SM_PACKAGE    /*suppress error about including H5SMpkg  */
-
-#include "H5private.h"    /* Generic Functions      */
-#include "H5Apkg.h"    /* Attributes        */
-#include "H5B2pkg.h"    /* v2 B-trees        */
-#include "H5Dprivate.h"    /* Datasets        */
-#include "H5Eprivate.h"    /* Error handling        */
-#include "H5EApkg.h"    /* Extensible Arrays      */
-#include "H5FApkg.h"    /* Fixed Arrays        */
-#include "H5Fpkg.h"             /* File access        */
-#include "H5FSprivate.h"  /* Free space manager      */
-#include "H5Gpkg.h"    /* Groups        */
-#include "H5HFpkg.h"    /* Fractal heaps      */
-#include "H5HGprivate.h"  /* Global Heaps        */
-#include "H5Iprivate.h"    /* IDs            */
-#include "H5Opkg.h"             /* Object headers      */
+#define H5F_PACKAGE     /*suppress error about including H5Fpkg  */
+#define H5G_PACKAGE     /*suppress error about including H5Gpkg  */
+#define H5HF_PACKAGE    /*suppress error about including H5HFpkg */
+#define H5O_PACKAGE     /*suppress error about including H5Opkg  */
+#define H5SM_PACKAGE    /*suppress error about including H5SMpkg */
+
+#include "H5private.h"  /* Generic Functions    */
+#include "H5Apkg.h"     /* Attributes           */
+#include "H5B2pkg.h"    /* v2 B-trees           */
+#include "H5Dpkg.h"     /* Datasets             */
+#include "H5Eprivate.h" /* Error handling       */
+#include "H5EApkg.h"    /* Extensible Arrays    */
+#include "H5FApkg.h"    /* Fixed Arrays         */
+#include "H5Fpkg.h"     /* File access          */
+#include "H5FSprivate.h" /* Free space manager  */
+#include "H5Gpkg.h"     /* Groups               */
+#include "H5HFpkg.h"    /* Fractal heaps        */
+#include "H5HGprivate.h" /* Global Heaps        */
+#include "H5Iprivate.h" /* IDs                  */
+#include "H5Opkg.h"     /* Object headers       */
 #include "H5SMpkg.h"    /* Implicitly shared messages    */
 
 /* File drivers */
diff --git a/tools/testfiles/filter_fail.ddl b/tools/testfiles/filter_fail.ddl
index 75534e2..1fc0506 100644
--- a/tools/testfiles/filter_fail.ddl
+++ b/tools/testfiles/filter_fail.ddl
@@ -12,13 +12,13 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dread(): can't read data
     major: Dataset
     minor: Read failed
-  #001: (file name) line (number) in H5D_read(): can't read data
+  #001: (file name) line (number) in H5D__read(): can't read data
     major: Dataset
     minor: Read failed
-  #002: (file name) line (number) in H5D_chunk_read(): unable to read raw data chunk
+  #002: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
     major: Low-level I/O
     minor: Read failed
-  #003: (file name) line (number) in H5D_chunk_lock(): data pipeline read failed
+  #003: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
     major: Data filters
     minor: Filter operation failed
   #004: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered