[svn-r8117] Purpose:

    Code cleanup

Description:
    Add C++ and FORTRAN wrappers for new H5Pdelete_filter routine, along with
documentation and a note in the release notes.

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    Linux 2.4 (verbena) w/ C++ and FORTRAN
    Too minor for full h5committest

1 files changed, 50 insertions, 57 deletions

diff --git a/src/H5Z.c b/src/H5Z.c
index 6aa984f..d0b3783 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -1104,63 +1104,56 @@ done:
 herr_t
 H5Z_delete(H5O_pline_t *pline, H5Z_filter_t filter)
 {
- size_t idx;               /* Index of filter in pipeline */
- herr_t ret_value=SUCCEED; /* Return value */
- size_t i, found=0;
- 
- FUNC_ENTER_NOAPI(H5Z_delete, FAIL)
-  
- /* Check args */
- assert(pline);
- assert(filter>=0 && filter<=H5Z_FILTER_MAX);
-
- /* if the pipeline has no filters, just return */
- if(pline->nused==0)
-  HGOTO_DONE(FALSE)
- 
- /* Delete all filters */
- if (H5Z_FILTER_NONE==filter)
- {
-  if(H5O_reset(H5O_PLINE_ID, pline)<0)
-   HGOTO_ERROR(H5E_PLINE, H5E_CANTFREE, FAIL, "can't release pipeline info")
- }
- /* Delete filter */
- else
- {
-  /* Locate the filter in the pipeline */
-  for(idx=0; idx<pline->nused; idx++)
-  {
-   if(pline->filter[idx].id==filter)
-   {
-    found=1;
-    break;
-   }
-  }
-  /* filter was not found in the pipeline */
-  if (!found)
-   HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, FAIL, "filter not in pipeline")
-   
-  /* Free, reset */
-  H5MM_xfree(pline->filter[idx].name);
-  H5MM_xfree(pline->filter[idx].cd_values);
-  HDmemset(&pline->filter[idx], 0, sizeof (H5Z_filter_info_t));
-  
-  /* Reorder array */
-  if (idx+1<pline->nused)
-  {
-   for(i=idx; i<pline->nused; i++)
-   {
-    pline->filter[i] = pline->filter[i+1];
-   }
-  }
-  /* Decrement number of used filters */
-  pline->nused--;
-  
- }
- 
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-} 
+    herr_t ret_value=SUCCEED; /* Return value */
+
+    FUNC_ENTER_NOAPI(H5Z_delete, FAIL)
+
+    /* Check args */
+    assert(pline);
+    assert(filter>=0 && filter<=H5Z_FILTER_MAX);
+
+    /* if the pipeline has no filters, just return */
+    if(pline->nused==0)
+        HGOTO_DONE(SUCCEED)
+
+    /* Delete all filters */
+    if (H5Z_FILTER_NONE==filter) {
+        if(H5O_reset(H5O_PLINE_ID, pline)<0)
+            HGOTO_ERROR(H5E_PLINE, H5E_CANTFREE, FAIL, "can't release pipeline info")
+    } /* end if */
+    /* Delete filter */
+    else {
+        size_t idx;             /* Index of filter in pipeline */
+        unsigned found=0;       /* Indicate filter was found in pipeline */
 
+        /* Locate the filter in the pipeline */
+        for(idx=0; idx<pline->nused; idx++)
+            if(pline->filter[idx].id==filter) {
+                found=1;
+                break;
+            }
+
+        /* filter was not found in the pipeline */
+        if (!found)
+            HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, FAIL, "filter not in pipeline")
+
+        /* Free information for deleted filter */
+        H5MM_xfree(pline->filter[idx].name);
+        H5MM_xfree(pline->filter[idx].cd_values);
+
+        /* Remove filter from pipeline array */
+        if((idx+1)<pline->nused)
+            HDmemcpy(&pline->filter[idx], &pline->filter[idx+1],
+                sizeof (H5Z_filter_info_t)*(pline->nused-(idx+1)));
+
+        /* Decrement number of used filters */
+        pline->nused--;
 
+        /* Reset information for previous last filter in pipeline */
+        HDmemset(&pline->filter[pline->nused], 0, sizeof (H5Z_filter_info_t));
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+}