[svn-r11686] Purpose:

    New feature

Description:
    Add in baseline "object copy" code from Peter [in the form of a new API
routine: H5Gcopy()].  There's still some work to do (like handling variable-
length datatypes and possibly support for references) and it hasn't been tested
on mounted files yet, but the core functionality is there and working
correctly.

    I've also got a set of patches to update the 1.6 branch with tweaks to
keep the branches mostly in sync, but Elena will kill me if I import them
before the 1.6.5 release is out... :-)

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    h5committested

1 files changed, 9 insertions, 9 deletions

diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 1f75af4..83bebe9 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -5371,7 +5371,7 @@ H5S_hyper_rebuild_helper(const H5S_hyper_span_t *span, H5S_hyper_dim_t span_slab
     hsize_t curr_start;
     hsize_t curr_low;
     int     outcount;
-    int     i;
+    unsigned u;
     H5S_hyper_dim_t      canon_down_span_slab_info[H5S_MAX_RANK];
     hbool_t ret_value = TRUE;
    
@@ -5414,17 +5414,17 @@ H5S_hyper_rebuild_helper(const H5S_hyper_span_t *span, H5S_hyper_dim_t span_slab
                     /* Compare the slab information of the adjacent spans in the down span tree.
                        We have to compare all the sub-tree slab information with the canon_down_span_slab_info.*/
 
-                    for( i = 0; i < rank - 1; i++) {
-                       curr_down_span_slab_info = &span_slab_info[i];
+                    for( u = 0; u < rank - 1; u++) {
+                       curr_down_span_slab_info = &span_slab_info[u];
 
-                       if(curr_down_span_slab_info->count > 0 && canon_down_span_slab_info[i].count > 0) {
-                          if(curr_down_span_slab_info->start != canon_down_span_slab_info[i].start
-                              || curr_down_span_slab_info->stride != canon_down_span_slab_info[i].stride
-                              || curr_down_span_slab_info->block != canon_down_span_slab_info[i].block
-                              || curr_down_span_slab_info->count != canon_down_span_slab_info[i].count)
+                       if(curr_down_span_slab_info->count > 0 && canon_down_span_slab_info[u].count > 0) {
+                          if(curr_down_span_slab_info->start != canon_down_span_slab_info[u].start
+                              || curr_down_span_slab_info->stride != canon_down_span_slab_info[u].stride
+                              || curr_down_span_slab_info->block != canon_down_span_slab_info[u].block
+                              || curr_down_span_slab_info->count != canon_down_span_slab_info[u].count)
                           HGOTO_DONE(FALSE)
                        } /* end if */
-                       else if (!((curr_down_span_slab_info->count == 0) && (canon_down_span_slab_info[i].count == 0)))
+                       else if (!((curr_down_span_slab_info->count == 0) && (canon_down_span_slab_info[u].count == 0)))
                           HGOTO_DONE(FALSE)
                     }
                 } /* end if */