[svn-r7080] Purpose:

    Bug fix (backward compatibility)

Description:
    Changes we've made during development of the 1.5.x branch had broken the
    feature of allowing user's callbacks to H5Giterate to return a value
    through the library back to the application which called H5Giterate.

Solution:
    Correctly pass along iterator callback return value and adjust internal
    library code to conform to this design.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

1 files changed, 7 insertions, 6 deletions

diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h
index 7230a55..c3ebf85 100644
--- a/src/H5Bprivate.h
+++ b/src/H5Bprivate.h
@@ -58,14 +58,15 @@ typedef enum H5B_ins_t {
 } H5B_ins_t;
 
 /* Define return values from operator callback function for H5B_iterate */
-typedef enum H5B_iterate_t {
-    H5B_ITER_ERROR       = -1,  /*error return value                         */
-    H5B_ITER_CONT        = 0,   /*continue the loop                          */
-    H5B_ITER_STOP        = 1    /*stop and break the loop                    */
-} H5B_iterate_t;
+/* (Actually, any postive value will cause the iterator to stop and pass back
+ *      that positive value to the function that called the iterator)
+ */
+#define H5B_ITER_ERROR  (-1)
+#define H5B_ITER_CONT   (0)
+#define H5B_ITER_STOP   (1)
 
 /* Define the operator callback function pointer for H5B_iterate() */
-typedef H5B_iterate_t (*H5B_operator_t)(H5F_t *f, hid_t, void *_lt_key, haddr_t addr,
+typedef int (*H5B_operator_t)(H5F_t *f, hid_t, void *_lt_key, haddr_t addr,
                                         void *_rt_key, void *_udata);
 
 /* Typedef for B-tree in memory (defined in H5Bpkg.h) */