Merge pull request #1197 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:hdf5_1_10 to hdf5_1_10

* commit '09b74727d32a931744b125cb105c61734a0270b8':
  Corrected comment
  Fix JIRA number format
  HDFFV-10552 fix makevers script and undeprecate 1.10 functions

4 files changed, 71 insertions, 65 deletions

diff --git a/bin/make_vers b/bin/make_vers
index 7e7fba1..4de2dbd 100755
--- a/bin/make_vers
+++ b/bin/make_vers
@@ -7,8 +7,8 @@ require 5.003;
 #       is added (like support for 1.4, etc), the min_sup_idx parameter will
 #       need to be decremented. - QAK)
 
-# Max. library "index" (0 = v1.0, 1 = 1.2, etc)
-$max_idx = 5;
+# Max. library "index" (0 = v1.0, 1 = 1.2, 2 = 1.4, 3 = 1.6, 4 = 1.8, 5 = 1.10, 6 = 1.12, etc)
+$max_idx = 6;
 
 # Min. supported previous library version "index" (0 = v1.0, 1 = 1.2, etc)
 $min_sup_idx = 3;
@@ -478,7 +478,7 @@ for $file (@ARGV) {
         }
     }
     close SOURCE;
-  
+
     # Create header files
     print "Generating '", $prefix, "H5version.h'\n";
     create_public($prefix);
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 4cc4fdb..8dbc018 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -141,7 +141,7 @@ New Features
 
       Change parent class from Exception to RuntimeException.
 
-      (ADB - 2018/07/30, HDFFV10534)
+      (ADB - 2018/07/30, HDFFV-10534)
 
     - JNI Read and Write
 
@@ -149,7 +149,7 @@ New Features
       to correct dataset and attribute reads. New write functions,
       H5DwriteVL and H5AwriteVL, are under construction.
 
-      (ADB - 2018/06/02, HDFFV10519)
+      (ADB - 2018/06/02, HDFFV-10519)
 
     Tools:
     ------
diff --git a/src/H5Odeprec.c b/src/H5Odeprec.c
index 876579d..296feaf 100644
--- a/src/H5Odeprec.c
+++ b/src/H5Odeprec.c
@@ -13,7 +13,7 @@
 
 /*-------------------------------------------------------------------------
  *
- * Purpose:	Deprecated functions from the H5O interface.  These
+ * Purpose:    Deprecated functions from the H5O interface.  These
  *              functions are here for compatibility purposes and may be
  *              removed in the future.  Applications should switch to the
  *              newer APIs.
@@ -71,9 +71,11 @@
 /*******************/
 
 
+/* Future function prototypes to be deprecated in next major version
+ * see HDFFV-10552
 #ifndef H5_NO_DEPRECATED_SYMBOLS
+ */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Oget_info1
  *
@@ -107,7 +109,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oget_info1() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Oget_info_by_name1
  *
@@ -147,7 +149,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oget_info_by_name1() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Oget_info_by_idx1
  *
@@ -205,9 +207,9 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Oget_info_by_idx1() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	H5Ovisit1
+ * Function:    H5Ovisit1
  *
  * Purpose:     Recursively visit an object and all the objects reachable
  *              from it.  If the starting object is a group, all the objects
@@ -226,14 +228,14 @@ done:
  *              the callback about the object.
  *
  * Return:      Success:    The return value of the first operator that
- *				returns non-zero, or zero if all members were
- *				processed with no operator returning non-zero.
+ *                returns non-zero, or zero if all members were
+ *                processed with no operator returning non-zero.
  *
  *              Failure:    Negative if something goes wrong within the
- *				library, or the negative value returned by one
- *				of the operators.
+ *                library, or the negative value returned by one
+ *                of the operators.
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              November 25 2007
  *
  *-------------------------------------------------------------------------
@@ -263,7 +265,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ovisit1() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Ovisit_by_name1
  *
@@ -284,14 +286,14 @@ done:
  *              the callback about the object.
  *
  * Return:      Success:    The return value of the first operator that
- *				returns non-zero, or zero if all members were
- *				processed with no operator returning non-zero.
+ *                returns non-zero, or zero if all members were
+ *                processed with no operator returning non-zero.
  *
  *              Failure:    Negative if something goes wrong within the
- *				library, or the negative value returned by one
- *				of the operators.
+ *                library, or the negative value returned by one
+ *                of the operators.
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              November 24 2007
  *
  *-------------------------------------------------------------------------
@@ -328,5 +330,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Ovisit_by_name1() */
 
+/* Future function prototypes to be deprecated in next major version
+ * see HDFFV-10552
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-
+ */
diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index da2910d..3a34fd2 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -26,9 +26,9 @@
 #define _H5Opublic_H
 
 /* Public headers needed by this file */
-#include "H5public.h"		/* Generic Functions			*/
-#include "H5Ipublic.h"		/* IDs			  		*/
-#include "H5Lpublic.h"		/* Links		  		*/
+#include "H5public.h"        /* Generic Functions            */
+#include "H5Ipublic.h"        /* IDs                      */
+#include "H5Lpublic.h"        /* Links                  */
 
 /*****************/
 /* Public Macros */
@@ -38,7 +38,7 @@
 #define H5O_COPY_SHALLOW_HIERARCHY_FLAG (0x0001u)   /* Copy only immediate members */
 #define H5O_COPY_EXPAND_SOFT_LINK_FLAG  (0x0002u)   /* Expand soft links into new objects */
 #define H5O_COPY_EXPAND_EXT_LINK_FLAG   (0x0004u)   /* Expand external links into new objects */
-#define H5O_COPY_EXPAND_REFERENCE_FLAG	(0x0008u)   /* Copy objects that are pointed by references */
+#define H5O_COPY_EXPAND_REFERENCE_FLAG    (0x0008u)   /* Copy objects that are pointed by references */
 #define H5O_COPY_WITHOUT_ATTR_FLAG      (0x0010u)   /* Copy object without copying attributes */
 #define H5O_COPY_PRESERVE_NULL_FLAG     (0x0020u)   /* Copy NULL messages (empty space) */
 #define H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG (0x0040u)   /* Merge committed datatypes in dest file */
@@ -75,7 +75,7 @@
 
 /* Flags for H5Oget_info.
  * Theses flags determine which fields will be filled in in the H5O_info_t
- * struct.  
+ * struct.
  */
 #define H5O_INFO_BASIC          0x0001u         /* Fill in the fileno, addr, type, and rc fields */
 #define H5O_INFO_TIME           0x0002u         /* Fill in the atime, mtime, ctime, and btime fields */
@@ -90,42 +90,42 @@
 
 /* Types of objects in file */
 typedef enum H5O_type_t {
-    H5O_TYPE_UNKNOWN = -1,	/* Unknown object type		*/
-    H5O_TYPE_GROUP,	        /* Object is a group		*/
-    H5O_TYPE_DATASET,		/* Object is a dataset		*/
-    H5O_TYPE_NAMED_DATATYPE, 	/* Object is a named data type	*/
+    H5O_TYPE_UNKNOWN = -1,    /* Unknown object type        */
+    H5O_TYPE_GROUP,            /* Object is a group        */
+    H5O_TYPE_DATASET,        /* Object is a dataset        */
+    H5O_TYPE_NAMED_DATATYPE,     /* Object is a named data type    */
     H5O_TYPE_NTYPES             /* Number of different object types (must be last!) */
 } H5O_type_t;
 
 /* Information struct for object header metadata (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx) */
 typedef struct H5O_hdr_info_t {
-    unsigned version;		/* Version number of header format in file */
-    unsigned nmesgs;		/* Number of object header messages */
-    unsigned nchunks;		/* Number of object header chunks */
+    unsigned version;        /* Version number of header format in file */
+    unsigned nmesgs;        /* Number of object header messages */
+    unsigned nchunks;        /* Number of object header chunks */
     unsigned flags;             /* Object header status flags */
     struct {
-        hsize_t total;		/* Total space for storing object header in file */
-        hsize_t meta;		/* Space within header for object header metadata information */
-        hsize_t mesg;		/* Space within header for actual message information */
-        hsize_t free;		/* Free space within object header */
+        hsize_t total;        /* Total space for storing object header in file */
+        hsize_t meta;        /* Space within header for object header metadata information */
+        hsize_t mesg;        /* Space within header for actual message information */
+        hsize_t free;        /* Free space within object header */
     } space;
     struct {
-        uint64_t present;	/* Flags to indicate presence of message type in header */
-        uint64_t shared;	/* Flags to indicate message type is shared in header */
+        uint64_t present;    /* Flags to indicate presence of message type in header */
+        uint64_t shared;    /* Flags to indicate message type is shared in header */
     } mesg;
 } H5O_hdr_info_t;
 
 /* Information struct for object (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx) */
 typedef struct H5O_info_t {
-    unsigned long 	fileno;		/* File number that object is located in */
-    haddr_t 		addr;		/* Object address in file	*/
-    H5O_type_t 		type;		/* Basic object type (group, dataset, etc.) */
-    unsigned 		rc;		/* Reference count of object    */
-    time_t		atime;		/* Access time			*/
-    time_t		mtime;		/* Modification time		*/
-    time_t		ctime;		/* Change time			*/
-    time_t		btime;		/* Birth time			*/
-    hsize_t 		num_attrs;	/* # of attributes attached to object */
+    unsigned long     fileno;        /* File number that object is located in */
+    haddr_t         addr;        /* Object address in file    */
+    H5O_type_t         type;        /* Basic object type (group, dataset, etc.) */
+    unsigned         rc;        /* Reference count of object    */
+    time_t        atime;        /* Access time            */
+    time_t        mtime;        /* Modification time        */
+    time_t        ctime;        /* Change time            */
+    time_t        btime;        /* Birth time            */
+    hsize_t         num_attrs;    /* # of attributes attached to object */
     H5O_hdr_info_t      hdr;            /* Object header information */
     /* Extra metadata storage for obj & attributes */
     struct {
@@ -142,9 +142,9 @@ typedef herr_t (*H5O_iterate_t)(hid_t obj, const char *name, const H5O_info_t *i
     void *op_data);
 
 typedef enum H5O_mcdt_search_ret_t {
-    H5O_MCDT_SEARCH_ERROR = -1,	/* Abort H5Ocopy */
-    H5O_MCDT_SEARCH_CONT,	/* Continue the global search of all committed datatypes in the destination file */
-    H5O_MCDT_SEARCH_STOP	/* Stop the search, but continue copying.  The committed datatype will be copied but not merged. */
+    H5O_MCDT_SEARCH_ERROR = -1,    /* Abort H5Ocopy */
+    H5O_MCDT_SEARCH_CONT,    /* Continue the global search of all committed datatypes in the destination file */
+    H5O_MCDT_SEARCH_STOP    /* Stop the search, but continue copying.  The committed datatype will be copied but not merged. */
 } H5O_mcdt_search_ret_t;
 
 /* Callback to invoke when completing the search for a matching committed datatype from the committed dtype list */
@@ -197,6 +197,20 @@ H5_DLL herr_t H5Odisable_mdc_flushes(hid_t object_id);
 H5_DLL herr_t H5Oenable_mdc_flushes(hid_t object_id);
 H5_DLL herr_t H5Oare_mdc_flushes_disabled(hid_t object_id, hbool_t *are_disabled);
 
+/* Future function prototypes to be deprecated in next version */
+H5_DLL herr_t H5Oget_info1(hid_t loc_id, H5O_info_t *oinfo);
+H5_DLL herr_t H5Oget_info_by_name1(hid_t loc_id, const char *name, H5O_info_t *oinfo,
+    hid_t lapl_id);
+H5_DLL herr_t H5Oget_info_by_idx1(hid_t loc_id, const char *group_name,
+    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_info_t *oinfo,
+    hid_t lapl_id);
+
+H5_DLL herr_t H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
+    H5O_iterate_t op, void *op_data);
+H5_DLL herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name,
+    H5_index_t idx_type, H5_iter_order_t order, H5O_iterate_t op,
+    void *op_data, hid_t lapl_id);
+
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
  * Use of these symbols is deprecated.
@@ -216,18 +230,6 @@ typedef struct H5O_stat_t {
 } H5O_stat_t;
 
 /* Function prototypes */
-H5_DLL herr_t H5Oget_info1(hid_t loc_id, H5O_info_t *oinfo);
-H5_DLL herr_t H5Oget_info_by_name1(hid_t loc_id, const char *name, H5O_info_t *oinfo,
-    hid_t lapl_id);
-H5_DLL herr_t H5Oget_info_by_idx1(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_info_t *oinfo,
-    hid_t lapl_id);
-
-H5_DLL herr_t H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
-    H5O_iterate_t op, void *op_data);
-H5_DLL herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, H5O_iterate_t op,
-    void *op_data, hid_t lapl_id);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 #ifdef __cplusplus