Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '74e09473c825610d203565e5ed9deb156256d6ea':
  Minor normalization with 1.10.
This commit is contained in:
Allen Byrne 2020-07-20 14:08:55 -05:00
commit c0bc9d0e60
23 changed files with 162 additions and 236 deletions

View File

@ -12,7 +12,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu>
* Programmer: Quincey Koziol
* Monday, January 31, 2005
*
* Purpose: This file contains declarations which are visible only within

View File

@ -15,7 +15,7 @@
*
* Created: H5B2private.h
* Jan 31 2005
* Quincey Koziol <koziol@ncsa.uiuc.edu>
* Quincey Koziol
*
* Purpose: Private header for library accessible B-tree routines.
*

View File

@ -11,7 +11,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
* Programmer: Quincey Koziol
* Saturday, September 12, 2015
*
* Purpose: This file contains declarations which define macros for the

View File

@ -12,7 +12,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu>
* Programmer: Quincey Koziol
* Thursday, May 15, 2003
*
* Purpose: This file contains declarations which are visible only within

View File

@ -15,12 +15,10 @@
*
* Created: H5Bprivate.h
* Jul 10 1997
* Robb Matzke <matzke@llnl.gov>
* Robb Matzke
*
* Purpose: Private non-prototype header.
*
* Modifications:
*
*-------------------------------------------------------------------------
*/

View File

@ -11,7 +11,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@lbl.gov>
* Programmer: Quincey Koziol
* Sunday, February 25, 2018
*
* Purpose: This file contains declarations which define macros for the

View File

@ -11,7 +11,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
* Programmer: Quincey Koziol
* Saturday, September 12, 2015
*
* Purpose: This file contains declarations which define macros for the

View File

@ -12,7 +12,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu>
* Programmer: Quincey Koziol
* Monday, April 14, 2003
*
* Purpose: This file contains declarations which are visible only within

View File

@ -11,7 +11,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
* Programmer: Quincey Koziol
* Saturday, September 12, 2015
*
* Purpose: This file contains declarations which define macros for the

View File

@ -12,7 +12,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
* Programmer: Quincey Koziol
* Tuesday, June 17, 2008
*
* Purpose: This file contains declarations which are visible only

View File

@ -15,7 +15,7 @@
*
* Created: H5EAprivate.h
* Jun 17 2008
* Quincey Koziol <koziol@hdfgroup.org>
* Quincey Koziol
*
* Purpose: Private header for library accessible extensible
* array routines.

View File

@ -15,7 +15,7 @@
*
* Created: H5EAsblock.c
* Sep 30 2008
* Quincey Koziol <koziol@hdfgroup.org>
* Quincey Koziol
*
* Purpose: Super block routines for extensible arrays.
*
@ -98,7 +98,6 @@ H5FL_BLK_DEFINE(page_init);
* Return: Non-NULL pointer to super block on success/NULL on failure
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Sep 30 2008
*
*-------------------------------------------------------------------------
@ -179,7 +178,6 @@ END_FUNC(PKG) /* end H5EA__sblock_alloc() */
* Return: Valid file address on success/HADDR_UNDEF on failure
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Sep 30 2008
*
*-------------------------------------------------------------------------
@ -267,7 +265,6 @@ END_FUNC(PKG) /* end H5EA__sblock_create() */
* Return: Non-NULL pointer to data block on success/NULL on failure
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Sep 30 2008
*
*-------------------------------------------------------------------------
@ -328,7 +325,6 @@ END_FUNC(PKG) /* end H5EA__sblock_protect() */
* Return: Non-negative on success/Negative on failure
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Sep 30 2008
*
*-------------------------------------------------------------------------
@ -359,7 +355,6 @@ END_FUNC(PKG) /* end H5EA__sblock_unprotect() */
* Return: SUCCEED/FAIL
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Sep 30 2008
*
*-------------------------------------------------------------------------
@ -408,7 +403,6 @@ END_FUNC(PKG) /* end H5EA__sblock_delete() */
* Return: Non-negative on success/Negative on failure
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Sep 30 2008
*
*-------------------------------------------------------------------------

View File

@ -15,7 +15,7 @@
*
* Created: H5Glink.c
* Nov 13 2006
* Quincey Koziol <koziol@hdfgroup.org>
* Quincey Koziol
*
* Purpose: Functions for handling links in groups.
*
@ -98,7 +98,6 @@ static int H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2);
* (i.e. same as strcmp())
*
* Programmer: Quincey Koziol
* koziol@ncsa.uiuc.edu
* Sep 5 2005
*
*-------------------------------------------------------------------------
@ -125,7 +124,6 @@ H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2)
* (i.e. opposite strcmp())
*
* Programmer: Quincey Koziol
* koziol@ncsa.uiuc.edu
* Sep 25 2006
*
*-------------------------------------------------------------------------
@ -151,7 +149,6 @@ H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2)
* as equal, their order in the sorted array is undefined.
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Nov 6 2006
*
*-------------------------------------------------------------------------
@ -186,7 +183,6 @@ H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
* as equal, their order in the sorted array is undefined.
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Nov 6 2006
*
*-------------------------------------------------------------------------
@ -217,7 +213,6 @@ H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
* Return: Non-negative on success/Negative on failure
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Sep 16 2006
*
*-------------------------------------------------------------------------
@ -561,7 +556,6 @@ done:
* Return: Non-negative on success/Negative on failure
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Nov 13 2006
*
*-------------------------------------------------------------------------

View File

@ -15,7 +15,7 @@
*
* Created: H5Gloc.c
* Sep 13 2005
* Quincey Koziol <koziol@ncsa.uiuc.edu>
* Quincey Koziol
*
* Purpose: Functions for working with group "locations"
*

View File

@ -15,7 +15,7 @@
*
* Created: H5Gname.c
* Sep 12 2005
* Quincey Koziol <koziol@ncsa.uiuc.edu>
* Quincey Koziol
*
* Purpose: Functions for handling group hierarchy paths.
*
@ -123,7 +123,6 @@ H5FL_BLK_EXTERN(str_buf);
* Failure: Ptr to the null terminator of NAME.
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Aug 11 1997
*
*-------------------------------------------------------------------------
@ -216,7 +215,7 @@ done:
* Return: TRUE for valid prefix, FALSE for not a valid prefix, FAIL
* on error
*
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
* Programmer: Quincey Koziol
*
* Date: September 24, 2002
*
@ -281,7 +280,7 @@ done:
*
* Return: Pointer to reference counted string on success, NULL on error
*
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
* Programmer: Quincey Koziol
*
* Date: August 19, 2005
*
@ -343,7 +342,7 @@ done:
* Return: Success: Non-NULL, combined path
* Failure: NULL
*
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
* Programmer: Quincey Koziol
* Tuesday, October 11, 2005
*
*-------------------------------------------------------------------------
@ -379,7 +378,7 @@ H5G_build_fullpath_refstr_str(H5RS_str_t *prefix_r, const char *name)
*
* Return: Pointer to reference counted string on success, NULL on error
*
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
* Programmer: Quincey Koziol
*
* Date: August 19, 2005
*
@ -448,7 +447,7 @@ H5G__name_init(H5G_name_t *name, const char *path)
* Return: Success: Non-negative
* Failure: Negative
*
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
* Programmer: Pedro Vicente
* Thursday, August 22, 2002
*
*-------------------------------------------------------------------------
@ -552,10 +551,6 @@ H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth)
* Programmer: Quincey Koziol
* Tuesday, December 13, 2005
*
* Modifications: Leon Arber
* Oct. 18, 2006
* Added functionality to get the name for a reference.
*
*-------------------------------------------------------------------------
*/
ssize_t
@ -639,7 +634,7 @@ H5G_name_reset(H5G_name_t *name)
*
* Return: Success
*
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
* Programmer: Pedro Vicente
*
* Date: August 22, 2002
*
@ -777,7 +772,7 @@ done:
*
* Return: Success: 0, Failure: -1
*
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
* Programmer: Pedro Vicente
*
* Date: June 5, 2002
*
@ -1060,7 +1055,7 @@ done:
*
* Return: Success: 0, Failure: -1
*
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
* Programmer: Pedro Vicente
*
* Date: June 11, 2002
*

View File

@ -15,7 +15,7 @@
*
* Created: H5Gnode.c
* Jun 26 1997
* Robb Matzke <matzke@llnl.gov>
* Robb Matzke
*
* Purpose: Functions for handling symbol table nodes. A
* symbol table node is a small collection of symbol
@ -145,8 +145,6 @@ H5FL_SEQ_DEFINE(H5G_entry_t);
* Programmer: Robb Matzke
* Wednesday, October 8, 1997
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static H5UC_t *
@ -169,7 +167,6 @@ H5G_node_get_shared(const H5F_t *f, const void H5_ATTR_UNUSED *_udata)
* Return: Non-negative on success/Negative on failure
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Jul 8 1997
*
*-------------------------------------------------------------------------
@ -199,7 +196,6 @@ H5G_node_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
* Return: Non-negative on success/Negative on failure
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Jul 8 1997
*
*-------------------------------------------------------------------------
@ -270,7 +266,6 @@ H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
* Return: Non-negative on success/Negative on failure
*
* Programmer: Quincey Koziol
* koziol@ncsa.uiuc.edu
* Jan 15 2003
*
*-------------------------------------------------------------------------
@ -310,7 +305,6 @@ H5G__node_free(H5G_node_t *sym)
* Failure: Negative
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Jun 23 1997
*
*-------------------------------------------------------------------------
@ -382,11 +376,8 @@ done:
* Failure: FAIL (same as LT_KEY<RT_KEY)
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Jun 23 1997
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
@ -439,11 +430,8 @@ done:
* Failure: FAIL (same as UDATA < LT_KEY)
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Jun 23 1997
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
@ -501,7 +489,6 @@ done:
* Failure: Negative if not found.
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Jun 23 1997
*
*-------------------------------------------------------------------------
@ -591,7 +578,6 @@ done:
* Failure: H5B_INS_ERROR, NEW_NODE_P might not be initialized.
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Jun 24 1997
*
*-------------------------------------------------------------------------
@ -951,7 +937,6 @@ done:
* Return: Non-negative on success/Negative on failure
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Jun 24 1997
*
*-------------------------------------------------------------------------
@ -1368,7 +1353,6 @@ done:
* Return: Non-negative on success/Negative on failure
*
* Programmer: Quincey Koziol
* koziol@hdfgroup.org
* Nov 19 2006
*
*-------------------------------------------------------------------------
@ -1475,7 +1459,6 @@ H5G__node_iterate_size(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key,
* Return: 0(zero) on success/Negative on failure
*
* Programmer: Robb Matzke
* matzke@llnl.gov
* Aug 4 1997
*
*-------------------------------------------------------------------------

View File

@ -11,7 +11,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
* Programmer: Quincey Koziol
* Saturday, September 12, 2015
*
* Purpose: This file contains declarations which define macros for the

View File

@ -12,7 +12,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
* Programmer: Quincey Koziol
* Wednesday, July 9, 2003
*
* Purpose: This file contains declarations which are visible

View File

@ -15,7 +15,7 @@
*
* Created: H5HLprivate.h
* Jul 16 1997
* Robb Matzke <matzke@llnl.gov>
* Robb Matzke
*
* Purpose: Private declarations for the H5HL (local heap) package.
*

View File

@ -12,7 +12,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Programmer: Raymond Lu <slu@ncsa.uiuc.edu>
* Programmer: Raymond Lu
* Jan 3, 2003
*/

View File

@ -400,8 +400,6 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
* Return: Always succeeds.
* Programmer: Bill Wendling
* 26. August 2003
* Modifications:
* Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
*
*-------------------------------------------------------------------------
*/
@ -565,8 +563,6 @@ done:
* Return: Nothing
* Programmer: Bill Wendling
* 25. August 2003
* Modifications:
* Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
*
*-------------------------------------------------------------------------
*/
@ -634,8 +630,6 @@ done:
* NULLure: NULL
* Programmer: Bill Wendling
* 26. August 2003
* Modifications:
* Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
*
*-------------------------------------------------------------------------
*/
@ -728,8 +722,6 @@ done:
* NULLure: NULL
* Programmer: Bill Wendling
* 26. August 2003
* Modifications:
* Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
*
*-------------------------------------------------------------------------
*/
@ -828,8 +820,6 @@ done:
* NULLure: NULL
* Programmer: Bill Wendling
* 26. August 2003
* Modifications:
* Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
*
*-------------------------------------------------------------------------
*/
@ -972,8 +962,6 @@ done:
* NULLure: NULL
* Programmer: Bill Wendling
* 26. August 2003
* Modifications:
* Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
*
*-------------------------------------------------------------------------
*/
@ -1002,7 +990,6 @@ done:
* Return: SUCCEED if transform applied successfully, FAIL otherwise
* Programmer: Leon Arber
* 5/1/04
* Modifications:
*
*-------------------------------------------------------------------------
*/
@ -1115,8 +1102,6 @@ done:
* Return: Nothing
* Programmer: Leon Arber
* 5/1/04
* Modifications:
*
*
* Notes: In the case of a polynomial data transform (ie, the left and right subtree
* are both of type H5Z_XFORM_SYMBOL), the convention is that the left hand side
@ -1213,8 +1198,6 @@ done:
* Function: H5Z_find_type
* Return: Native type of datatype that is passed in
* Programmer: Leon Arber, 4/20/04
* Modifications:
*
*
*-------------------------------------------------------------------------
*/
@ -1301,7 +1284,6 @@ done:
* of the one passed in.
* Programmer: Leon Arber
* April 1, 2004.
* Modifications:
*
*-------------------------------------------------------------------------
*/
@ -1375,7 +1357,6 @@ done:
* Return: TRUE or FALSE
* Programmer: Raymond Lu
* 15 March 2012
* Modifications:
*
*-------------------------------------------------------------------------
*/
@ -1404,7 +1385,6 @@ H5Z_op_is_numbs(H5Z_node* _tree)
* Return: TRUE or FALSE
* Programmer: Raymond Lu
* 15 March 2012
* Modifications:
*
*-------------------------------------------------------------------------
*/
@ -1490,11 +1470,6 @@ H5Z_xform_reduce_tree(H5Z_node* tree)
* Return: None.
* Programmer: Leon Arber
* April 1, 2004.
* Modifications:
* Raymond Lu
* 15 March 2012
* I added a new macro H5Z_XFORM_DO_OP6 to handle the special
* operations like -x or +x when the left operand is empty.
*
*-------------------------------------------------------------------------
*/
@ -1525,14 +1500,10 @@ H5Z_do_op(H5Z_node* tree)
* Success: SUCCEED
* Failure: FAIL
*
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
* Programmer: Quincey Koziol
*
* Date: May 4, 2004
*
* Comments:
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
H5Z_data_xform_t *
@ -1616,14 +1587,10 @@ done:
* Success: SUCCEED
* Failure: FAIL
*
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
* Programmer: Quincey Koziol
*
* Date: May 4, 2004
*
* Comments:
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
herr_t
@ -1662,7 +1629,7 @@ H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop)
* Success: SUCCEED
* Failure: FAIL
*
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
* Programmer: Quincey Koziol
*
* Date: May 4, 2004
*
@ -1742,14 +1709,12 @@ done:
*
* Return: TRUE for no data transform, FALSE for a data transform
*
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
* Programmer: Quincey Koziol
*
* Date: May 4, 2004
*
* Comments: Can't fail
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
hbool_t
@ -1773,12 +1738,10 @@ H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop)
* Return:
* Pointer to a copy of the string in the data_xform property.
*
* Programmer: Leon Arber, larber@ncsa.uiuc.edu
* Programmer: Leon Arber
*
* Date: Sept. 4, 2004
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
const char *

View File

@ -15,7 +15,7 @@
*
* Created: H5dbg.c
* Mar 4 2006
* Quincey Koziol <koziol@ncsa.uiuc.edu>
* Quincey Koziol
*
* Purpose: Generic debugging routines
*
@ -70,7 +70,6 @@
* Return: Non-negative on success/Negative on failure
*
* Programmer: Quincey Koziol
* koziol@ncsa.uiuc.edu
* Mar 4 2006
*
*-------------------------------------------------------------------------