[svn-r8149]

Purpose:
replaced name of delete filter with remove filter for the new function H5Premove_filter

Description:

Solution:

Platforms tested:
linux

Misc. update:

13 files changed, 47 insertions, 47 deletions

diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp
index 22a8f28..efaf30d 100644
--- a/c++/src/H5DcreatProp.cpp
+++ b/c++/src/H5DcreatProp.cpp
@@ -126,13 +126,13 @@ void DSetCreatPropList::setFilter( H5Z_filter_t filter, unsigned int flags, size
 }
 
 // Removes one or more filters to the filter pipeline
-void DSetCreatPropList::deleteFilter( H5Z_filter_t filter) const
+void DSetCreatPropList::removeFilter( H5Z_filter_t filter) const
 {
-   herr_t ret_value = H5Pdelete_filter( id, filter);
+   herr_t ret_value = H5Premove_filter( id, filter);
    if( ret_value < 0 )
    {
-      throw PropListIException("DSetCreatPropList::deleteFilter",
-                "H5Pdelete_filter failed");
+      throw PropListIException("DSetCreatPropList::removeFilter",
+                "H5Premove_filter failed");
    }
 }
 
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index 3ef647f..55570c9 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -58,7 +58,7 @@ class H5_DLLCPP DSetCreatPropList : public PropList {
 	void setFilter( H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[] ) const;
 
 	// Remove one or all filters from the filter pipeline
-	void deleteFilter( H5Z_filter_t filter) const;
+	void removeFilter( H5Z_filter_t filter) const;
 
 	// Returns the number of filters in the pipeline 
 	int getNfilters() const;
diff --git a/doc/html/RM_H5P.html b/doc/html/RM_H5P.html
index d5e06e6..15edd68 100644
--- a/doc/html/RM_H5P.html
+++ b/doc/html/RM_H5P.html
@@ -223,7 +223,7 @@ which require many different parameters to be easily manipulated.
     <li><a href="#Property-SetExternal">H5Pset_external</a>
     <li><a href="#Property-GetExternalCount">H5Pget_external_count</a>
     <li><a href="#Property-GetExternal">H5Pget_external</a>
-    <li><a href="#Property-DeleteFilter">H5Pdelete_filter</a>
+    <li><a href="#Property-DeleteFilter">H5Premove_filter</a>
     </ul>
 
     <p><i>Dataset Access, Memory, and <br> Transfer Properties</i>
@@ -283,7 +283,7 @@ See further notes in the description of each function.
       <li><a href="#Property-Create">H5Pcreate</a>
       <li><a href="#Property-CreateClass">H5Pcreate_class</a>
       <li><a href="#Property-CreateList">H5Pcreate_list</a>
-      <li><a href="#Property-Equal">H5Pdelete_filter</a>
+      <li><a href="#Property-Equal">H5Premove_filter</a>
       <li><a href="#Property-Equal">H5Pequal</a>
       <li><a href="#Property-Exist">H5Pexist</a>
       <li><a href="#Property-FillValueDefined">H5Pfill_value_defined</a>
@@ -510,7 +510,7 @@ as the corresponding C function.
     <li><a href="#Property-SetExternal">h5pset_external_f</a>
     <li><a href="#Property-GetExternalCount">h5pget_external_count_f</a>
     <li><a href="#Property-GetExternal">h5pget_external_f</a>
-    <li><a href="#Property-DeleteFilter">h5pdelete_filter_f</a>
+    <li><a href="#Property-DeleteFilter">h5premove_filter_f</a>
     </ul>
 
 <!--
@@ -1189,18 +1189,18 @@ SUBROUTINE
 </dl>
 
 <!-- NEW PAGE -->
-<!-- HEADER RIGHT "H5Pdelete_filter" -->
+<!-- HEADER RIGHT "H5Premove_filter" -->
 <hr>
 <dl>
-  <dt><strong>Name:</strong> <a name="Property-DeleteFilter">H5Pdelete_filter</a>
+  <dt><strong>Name:</strong> <a name="Property-RemoveFilter">H5Pdelete_filter</a>
   <dt><strong>Signature:</strong>
-    <dd><em>herr_t</em> <code>H5Pdelete_filter</code>(<em>hid_t</em> <code>plist</code>,
+    <dd><em>herr_t</em> <code>H5Premove_filter</code>(<em>hid_t</em> <code>plist</code>,
         <em>H5Z_filter_t</em> <code>filter</code>
     )
   <dt><strong>Purpose:</strong>
     <dd>Delete one or more filters in the filter pipeline.
   <dt><strong>Description:</strong>
-    <dd><code>H5Pdelete_filter</code> removes the specified 
+    <dd><code>H5Premove_filter</code> removes the specified 
         <code>filter</code> from the filter pipeline in <code>plist</code>.
 	<p>
 	The <code>filter</code> parameter specifies the filter to be removed.  
@@ -1257,10 +1257,10 @@ SUBROUTINE
     <dd>Returns a non-negative value if successful;
         otherwise returns a negative value.
 
-    <dt><strong>Fortran90 Interface:</strong> h5pdelete_filter_f
+    <dt><strong>Fortran90 Interface:</strong> h5premove_filter_f
     <dd>
 	<pre>
-SUBROUTINE h5pdelete_filter_f(prp_id, filter, hdferr) 
+SUBROUTINE h5premove_filter_f(prp_id, filter, hdferr) 
   IMPLICIT NONE
   INTEGER(HID_T), INTENT(IN) :: prp_id      ! Property list identifier
   INTEGER, INTENT(IN)        :: filter      ! Filter to be modified
@@ -1274,7 +1274,7 @@ SUBROUTINE h5pdelete_filter_f(prp_id, filter, hdferr)
                                             !
   INTEGER, INTENT(OUT)       :: hdferr      ! Error code
                                             ! 0 on success and -1 on failure
-END SUBROUTINE h5pdelete_filter_f
+END SUBROUTINE h5premove_filter_f
 	</pre>		
 		
 		<!--<dt><strong>Non-C API(s):</strong>
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index f9ad983..9503d81 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -3238,8 +3238,8 @@ DONE:
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pdelete_filter_c
- * Purpose:     Call H5Pdelete_filter to delete one or more filters
+ * Name:        h5premove_filter_c
+ * Purpose:     Call H5Premove_filter to delete one or more filters
  * Inputs:      prp_id - property list identifier 
  *              filter - Filter to be deleted
  * Returns:     0 on success, -1 on failure
@@ -3248,7 +3248,7 @@ DONE:
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5pdelete_filter_c (hid_t_f *prp_id, int_f* filter)
+nh5premove_filter_c (hid_t_f *prp_id, int_f* filter)
 {
      int ret_value = -1;
      hid_t c_prp_id;
@@ -3259,9 +3259,9 @@ nh5pdelete_filter_c (hid_t_f *prp_id, int_f* filter)
      c_prp_id = (hid_t)*prp_id;
 
      /*
-      * Call H5Pdelety_filter function.
+      * Call H5Premove_filter function.
       */
-     ret = H5Pdelete_filter(c_prp_id, c_filter);
+     ret = H5Premove_filter(c_prp_id, c_filter);
 
      if (ret < 0) goto DONE;
      ret_value = 0;
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index a49b602..11188a9 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -6333,7 +6333,7 @@
           END SUBROUTINE h5pmodify_filter_f
 
 !----------------------------------------------------------------------
-! Name:		h5pdelete_filter_f 
+! Name:		h5premove_filter_f 
 !
 ! Purpose: 	Delete one or more filters from the filter pipeline. 
 !
@@ -6356,11 +6356,11 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pdelete_filter_f(prp_id, filter, hdferr)
+          SUBROUTINE h5premove_filter_f(prp_id, filter, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5pdelete_filter_f
+!DEC$attributes dllexport :: h5premove_filter_f
 !DEC$endif
 !
             IMPLICIT NONE
@@ -6369,21 +6369,21 @@
 
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
-!            INTEGER, EXTERNAL :: h5pdelete_filter_c
+!            INTEGER, EXTERNAL :: h5premove_filter_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5pdelete_filter_c(prp_id, filter)
+              INTEGER FUNCTION h5premove_filter_c(prp_id, filter)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5PMODIFY_FILTER_C'::h5pdelete_filter_c
+              !MS$ATTRIBUTES C,reference,alias:'_H5PMODIFY_FILTER_C'::h5premove_filter_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: prp_id 
               INTEGER, INTENT(IN) :: filter 
-              END FUNCTION h5pdelete_filter_c
+              END FUNCTION h5premove_filter_c
             END INTERFACE
 
-            hdferr = h5pdelete_filter_c(prp_id, filter)
-          END SUBROUTINE h5pdelete_filter_f
+            hdferr = h5premove_filter_c(prp_id, filter)
+          END SUBROUTINE h5premove_filter_f
 
      END MODULE H5P
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index e42b59a..fa12186 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -770,7 +770,7 @@ H5_DLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
 #   define nh5pset_layout_c         FNAME(H5PSET_LAYOUT_C)
 #   define nh5pget_layout_c         FNAME(H5PGET_LAYOUT_C)
 #   define nh5pset_filter_c         FNAME(H5PSET_FILTER_C)
-#   define nh5pdelete_filter_c         FNAME(H5PDELETE_FILTER_C)
+#   define nh5premove_filter_c         FNAME(H5PREMOVE_FILTER_C)
 #   define nh5pmodify_filter_c         FNAME(H5PMODIFY_FILTER_C)
 #   define nh5pget_nfilters_c         FNAME(H5PGET_NFILTERS_C)
 #   define nh5pget_filter_c         FNAME(H5PGET_FILTER_C)
@@ -877,7 +877,7 @@ H5_DLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
 #   define nh5pset_layout_c         FNAME(h5pset_layout_c)
 #   define nh5pget_layout_c         FNAME(h5pget_layout_c)
 #   define nh5pset_filter_c         FNAME(h5pset_filter_c)
-#   define nh5pdelete_filter_c         FNAME(h5pdelete_filter_c)
+#   define nh5premove_filter_c         FNAME(h5premove_filter_c)
 #   define nh5pmodify_filter_c         FNAME(h5pmodify_filter_c)
 #   define nh5pget_nfilters_c         FNAME(h5pget_nfilters_c)
 #   define nh5pget_filter_c         FNAME(h5pget_filter_c)
@@ -1036,7 +1036,7 @@ nh5pget_layout_c (hid_t_f *prp_id, int_f* layout);
 H5_DLL int_f
 nh5pset_filter_c (hid_t_f *prp_id, int_f* filter, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values );
 H5_DLL int_f
-nh5pdelete_filter_c (hid_t_f *prp_id, int_f* filter);
+nh5premove_filter_c (hid_t_f *prp_id, int_f* filter);
 H5_DLL int_f
 nh5pmodify_filter_c (hid_t_f *prp_id, int_f* filter, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values );
 H5_DLL int_f
diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90
index 6d84139..214d2ab 100644
--- a/fortran/test/tH5Z.f90
+++ b/fortran/test/tH5Z.f90
@@ -94,7 +94,7 @@
      endif
 
 !
-! Verify h5pdelete_filter_f
+! Verify h5premove_filter_f
 !
      CALL h5zfilter_avail_f(H5Z_FILTER_FLETCHER32_F, status, error)
               CALL check("h5zfilter_avail_f", error, total_error)
@@ -118,7 +118,7 @@
             endif
 
             ! Delete a single filter
-            CALL h5pdelete_filter_f(crtpr_id, H5Z_FILTER_SHUFFLE_F, error)
+            CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_SHUFFLE_F, error)
                   CALL check("h5pset_shuffle_f", error, total_error) 
 
             ! Verify the correct number of filters now
@@ -130,8 +130,8 @@
             endif
 
             ! Delete all filters
-            CALL h5pdelete_filter_f(crtpr_id, H5Z_FILTER_NONE_F, error)
-                  CALL check("h5pdelete_filter_f", error, total_error) 
+            CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_NONE_F, error)
+                  CALL check("h5premove_filter_f", error, total_error) 
 
             ! Verify the correct number of filters now
             CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 16b7641..4c383ce 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -42,7 +42,7 @@ New Features
 
     Library:
     --------
-        - Added new H5Pdelete_filter routine to remove I/O pipeline filters
+        - Added new H5Premove_filter routine to remove I/O pipeline filters
             from dataset creation property lists.  PVN - 2004/01/26
         - Added new 'compare' callback parameter to H5Pregister & H5Pinsert
             routines.  QAK - 2004/01/07
diff --git a/src/H5MPprivate.h b/src/H5MPprivate.h
index f9fb8a9..0b33c54 100644
--- a/src/H5MPprivate.h
+++ b/src/H5MPprivate.h
@@ -292,7 +292,7 @@
 #define color_H5Pisa_class "red"
 #define color_H5Piterate "red"
 #define color_H5Pcopy_prop "red"
-#define color_H5Pdelete_filter "red"
+#define color_H5Premove_filter "red"
 #define color_H5Premove "red"
 #define color_H5Punregister "red"
 #define color_H5Pclose_class "red"
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index f0f1b31..0493db8 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -1622,7 +1622,7 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5Pdelete_filter
+ * Function: H5Premove_filter
  *
  * Purpose: Deletes a filter from the dataset creation property list;
  *  deletes all filters if FILTER is H5Z_FILTER_NONE  
@@ -1638,13 +1638,13 @@ done:
  */
 
 herr_t
-H5Pdelete_filter(hid_t plist_id, H5Z_filter_t filter)
+H5Premove_filter(hid_t plist_id, H5Z_filter_t filter)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     H5O_pline_t pline;          /* Filter pipeline */
     herr_t ret_value = SUCCEED; /* return value          */
 
-    FUNC_ENTER_API(H5Pdelete_filter, FAIL)
+    FUNC_ENTER_API(H5Premove_filter, FAIL)
     H5TRACE2("e","iZf",plist_id,filter);
 
     /* Get the property list structure */
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 3a7f754..9644b11 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -299,7 +299,7 @@ H5_DLL herr_t H5Pset_hyper_vector_size(hid_t fapl_id, size_t size);
 H5_DLL herr_t H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size/*out*/);
 H5_DLL herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size);
 H5_DLL herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size/*out*/);
-H5_DLL herr_t H5Pdelete_filter(hid_t plist_id, H5Z_filter_t filter);
+H5_DLL herr_t H5Premove_filter(hid_t plist_id, H5Z_filter_t filter);
 
 
 #ifdef __cplusplus
diff --git a/test/dsets.c b/test/dsets.c
index e189f9b..90e1d62 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -3137,7 +3137,7 @@ test_filter_delete(hid_t file)
     */
 #if defined H5_HAVE_FILTER_DEFLATE
     /* delete the deflate filter */
-    if (H5Pdelete_filter(dcpl1,H5Z_FILTER_DEFLATE)<0) goto error;
+    if (H5Premove_filter(dcpl1,H5Z_FILTER_DEFLATE)<0) goto error;
 
     /* get information about filters */
     if ((nfilters = H5Pget_nfilters(dcpl1))<0) goto error; 
@@ -3151,7 +3151,7 @@ test_filter_delete(hid_t file)
 
     /* Try to delete the deflate filter again */
     H5E_BEGIN_TRY {
-        ret=H5Pdelete_filter(dcpl1,H5Z_FILTER_DEFLATE);
+        ret=H5Premove_filter(dcpl1,H5Z_FILTER_DEFLATE);
     } H5E_END_TRY;
     if (ret >=0) {
         H5_FAILED();
@@ -3166,7 +3166,7 @@ test_filter_delete(hid_t file)
     *---------------------------------------------------------------------- 
     */
     /* delete all filters */
-    if (H5Pdelete_filter(dcpl1,H5Z_FILTER_NONE)<0) goto error; 
+    if (H5Premove_filter(dcpl1,H5Z_FILTER_NONE)<0) goto error; 
 
     /* get information about filters */
     if ((nfilters = H5Pget_nfilters(dcpl1))<0) goto error; 
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index aead698..42eecb2 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -192,7 +192,7 @@ int apply_filters(hid_t dcpl_id,
  {
   if (obj->filter[i].filtn==H5Z_FILTER_NONE)
   {
-   if (nfilters && H5Pdelete_filter(dcpl_id,H5Z_FILTER_NONE)<0) 
+   if (nfilters && H5Premove_filter(dcpl_id,H5Z_FILTER_NONE)<0) 
     return -1;
    return 0;
   }
@@ -205,7 +205,7 @@ int apply_filters(hid_t dcpl_id,
  */
 
  if (nfilters) {
-  if (H5Pdelete_filter(dcpl_id,H5Z_FILTER_NONE)<0) 
+  if (H5Premove_filter(dcpl_id,H5Z_FILTER_NONE)<0) 
    return -1;
  }