[svn-r14413] Description:

	Change H5P[gs]et_format_bounds() => H5P[gs]et_libver_bounds() and also
enumerated values H5F_FORMAT_{EARLIEST, LATEST} => H5F_LIBVER_{EARLIEST, LATEST}

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.4.10 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

4 files changed, 34 insertions, 34 deletions

diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 0bbfbfb..a055d46 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -107,11 +107,11 @@ typedef struct H5F_info_t {
     } sohm;
 } H5F_info_t;
 
-/* File format versions */
-typedef enum H5F_format_version_t {
-    H5F_FORMAT_EARLIEST,        /* Use the earliest possible format for storing objects */
-    H5F_FORMAT_LATEST           /* Use the latest possible format available for storing objects*/
-} H5F_format_version_t;
+/* Library's file format versions */
+typedef enum H5F_libver_t {
+    H5F_LIBVER_EARLIEST,        /* Use the earliest possible format for storing objects */
+    H5F_LIBVER_LATEST           /* Use the latest possible format available for storing objects*/
+} H5F_libver_t;
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 403e5bb..dd4a56f 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -1876,7 +1876,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_format_bounds
+ * Function:	H5Pset_libver_bounds
  *
  * Purpose:	Indicates which versions of the file format the library should
  *      use when creating objects.  LOW is the earliest version of the HDF5
@@ -1915,7 +1915,7 @@ done:
  *      Setting the LOW and HIGH values will not affect reading/writing existing
  *      objects, only the creation of new objects.
  *
- * Note: Eventually we want to add more values to the H5F_format_version_t
+ * Note: Eventually we want to add more values to the H5F_libver_t
  *      enumerated type that indicate library release values where the file
  *      format was changed (like "H5F_FORMAT_1_2_0" for the file format changes
  *      in the 1.2.x release branch and possily even "H5F_FORMAT_1_4_2" for
@@ -1962,41 +1962,41 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_format_bounds(hid_t plist_id, H5F_format_version_t low,
-    H5F_format_version_t high)
+H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
+    H5F_libver_t high)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     hbool_t latest;             /* Whether to use the latest version or not */
     herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_format_bounds, FAIL)
+    FUNC_ENTER_API(H5Pset_libver_bounds, FAIL)
     H5TRACE3("e", "iFvFv", plist_id, low, high);
 
     /* Check args */
     /* (Note that this is _really_ restricted right now, we'll want to loosen
      *  this up more as we add features - QAK)
      */
-    if(high != H5F_FORMAT_LATEST)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid high format bound")
+    if(high != H5F_LIBVER_LATEST)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid high library version bound")
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
-    latest = (low == H5F_FORMAT_LATEST) ? TRUE : FALSE;
+    latest = (low == H5F_LIBVER_LATEST) ? TRUE : FALSE;
     if(H5P_set(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set format bounds")
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set library version bounds")
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Pset_format_bounds() */
+} /* end H5Pset_libver_bounds() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pget_format_bounds
+ * Function:	H5Pget_libver_bounds
  *
- * Purpose:	Returns the current settings for the file format bounds
+ * Purpose:	Returns the current settings for the library version format bounds
  *      from a file access property list.
  *
  * Return:	Non-negative on success/Negative on failure
@@ -2007,14 +2007,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_format_bounds(hid_t plist_id, H5F_format_version_t *low/*out*/,
-    H5F_format_version_t *high/*out*/)
+H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low/*out*/,
+    H5F_libver_t *high/*out*/)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     hbool_t latest;             /* Whether to use the latest version or not */
     herr_t ret_value = SUCCEED; /* return value */
 
-    FUNC_ENTER_API(H5Pget_format_bounds, FAIL)
+    FUNC_ENTER_API(H5Pget_libver_bounds, FAIL)
     H5TRACE3("e", "ixx", plist_id, low, high);
 
     /* Get the plist structure */
@@ -2023,16 +2023,16 @@ H5Pget_format_bounds(hid_t plist_id, H5F_format_version_t *low/*out*/,
 
     /* Get value */
     if(H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get format bounds")
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get library version bounds")
 
     /* Check for setting values to return */
     /* (Again, this is restricted now, we'll need to open it up later -QAK) */
     if(low)
-        *low = latest ?  H5F_FORMAT_LATEST : H5F_FORMAT_EARLIEST;
+        *low = latest ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST;
     if(high)
-               *high = H5F_FORMAT_LATEST;
+        *high = H5F_LIBVER_LATEST;
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Pget_format_bounds() */
+} /* end H5Pget_libver_bounds() */
 
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 784d15c..f102c80 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -265,10 +265,10 @@ H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size);
 H5_DLL herr_t H5Pget_sieve_buf_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 H5Pset_format_bounds(hid_t plist_id, H5F_format_version_t low,
-    H5F_format_version_t high);
-H5_DLL herr_t H5Pget_format_bounds(hid_t plist_id, H5F_format_version_t *low,
-    H5F_format_version_t *high);
+H5_DLL herr_t H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
+    H5F_libver_t high);
+H5_DLL herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low,
+    H5F_libver_t *high);
 
 /* Dataset creation property list (DCPL) routines */
 H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout);
diff --git a/src/H5trace.c b/src/H5trace.c
index c709e8a..926a590 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -654,14 +654,14 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
                         else
                             fprintf(out, "NULL");
                     } else {
-                        H5F_format_version_t format_vers = va_arg(ap, H5F_format_version_t); /*lint !e64 Type mismatch not really occuring */
+                        H5F_libver_t libver_vers = va_arg(ap, H5F_libver_t); /*lint !e64 Type mismatch not really occuring */
 
-                        switch(format_vers) {
-                            case H5F_FORMAT_EARLIEST:
-                                fprintf(out, "H5F_FORMAT_EARLIEST");
+                        switch(libver_vers) {
+                            case H5F_LIBVER_EARLIEST:
+                                fprintf(out, "H5F_LIBVER_EARLIEST");
                                 break;
-                            case H5F_FORMAT_LATEST:
-                                fprintf(out, "H5F_FORMAT_LATEST");
+                            case H5F_LIBVER_LATEST:
+                                fprintf(out, "H5F_LIBVER_LATEST");
                                 break;
                         }
                     }