Skip to content

Commit

Permalink
1 8 Merges from develop (#432)
Browse files Browse the repository at this point in the history 
* Update supported platforms

* Merge PR#3 changes from develop

* # WARNING: head commit changed in the meantime

Merge gcc 10 diagnostics option from develop

Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop

* Format updates

* Fix missing semicolon and format fix

* Format update

* Correct actions, remove java option

* Update autotools build files

* Add testfiles

* Fix configure issue with make flags

* Init fapls to default

* Update generated files and fix h5repack id closure

* update format

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
whitespace cleanup
tools sync

* format alignment

* initialize vars

* revert H5private change

* Merge #380 from develop
  • Loading branch information
@byrnHDF
byrnHDF authored Mar 5, 2021
1 parent c1da03e commit 089a6f6
Show file tree
Hide file tree
Showing 100 changed files with 1,929 additions and 1,688 deletions.
1 change: 1 addition & 0 deletions MANIFEST
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1981,6 +1981,7 @@
./tools/h5diff/testfiles/h5diff_80.txt
./tools/h5diff/testfiles/h5diff_800.txt
./tools/h5diff/testfiles/h5diff_801.txt
./tools/h5diff/testfiles/h5diff_830.txt
./tools/h5diff/testfiles/h5diff_90.txt
./tools/h5diff/testfiles/h5diff_100.txt
./tools/h5diff/testfiles/h5diff_101.txt
Expand Down
6 changes: 3 additions & 3 deletions c++/src/H5AbstractDs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __AbstractDs_H
#define __AbstractDs_H
#ifndef AbstractDs_H
#define AbstractDs_H

namespace H5 {

Expand Down Expand Up @@ -95,4 +95,4 @@ class H5_DLLCPP AbstractDs {
}; // end of AbstractDs
} // namespace H5

#endif // __AbstractDs_H
#endif // AbstractDs_H
6 changes: 3 additions & 3 deletions c++/src/H5AcreatProp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5AttrCreatPropList_H
#define __H5AttrCreatPropList_H
#ifndef H5AttrCreatPropList_H
#define H5AttrCreatPropList_H

namespace H5 {

Expand Down Expand Up @@ -63,4 +63,4 @@ class H5_DLLCPP AttrCreatPropList : public StrCreatPropList {

} // namespace H5

#endif // __H5AttrCreatPropList_H
#endif // H5AttrCreatPropList_H
16 changes: 13 additions & 3 deletions c++/src/H5CommonFG.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __CommonFG_H
#define __CommonFG_H
#ifndef CommonFG_H
#define CommonFG_H

namespace H5 {

Expand Down Expand Up @@ -176,4 +176,14 @@ class H5_DLLCPP CommonFG {
}; // end of CommonFG
} // namespace H5

#endif // __CommonFG_H
#endif // CommonFG_H

/***************************************************************************
Design Note
===========
September 2017:
This class used to be base class of H5File as well, until the
restructure that moved H5File to be subclass of H5Group.
*/
6 changes: 3 additions & 3 deletions c++/src/H5Group.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __Group_H
#define __Group_H
#ifndef Group_H
#define Group_H

namespace H5 {

Expand Down Expand Up @@ -80,4 +80,4 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
}; // end of Group
} // namespace H5

#endif // __Group_H
#endif // Group_H
6 changes: 3 additions & 3 deletions c++/src/H5IdComponent.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __IdComponent_H
#define __IdComponent_H
#ifndef IdComponent_H
#define IdComponent_H

namespace H5 {

Expand Down Expand Up @@ -124,4 +124,4 @@ class H5_DLLCPP IdComponent {
}; // end class IdComponent
} // namespace H5

#endif // __IdComponent_H
#endif // IdComponent_H
6 changes: 3 additions & 3 deletions c++/src/H5StrcreatProp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5StrCreatPropList_H
#define __H5StrCreatPropList_H
#ifndef H5StrCreatPropList_H
#define H5StrCreatPropList_H

namespace H5 {

Expand Down Expand Up @@ -58,4 +58,4 @@ class H5_DLLCPP StrCreatPropList : public PropList {

} // namespace H5

#endif // __H5StrCreatPropList_H
#endif // H5StrCreatPropList_H
2 changes: 1 addition & 1 deletion config/gnu-cxxflags
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if test "X-g++" = "X-$cxx_vendor"; then
# Enhanced Diagnostics #
########################

if test $cc_vers_major -ge 10; then
if test $cxx_vers_major -ge 10; then
NO_DIAGS_CXXFLAGS="-fdiagnostics-urls=never -fno-diagnostics-color"
fi
DIAGS_CXXFLAGS=
Expand Down
2 changes: 1 addition & 1 deletion config/gnu-fflags
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
# Enhanced Diagnostics #
########################

if test $cc_vers_major -ge 10; then
if test $f9x_vers_major -ge 10; then
NO_DIAGS_FCFLAGS="-fdiagnostics-urls=never -fno-diagnostics-color"
fi
DIAGS_FCFLAGS=
Expand Down
4 changes: 2 additions & 2 deletions fortran/src/H5match_types.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ initCfile(void)
* help@hdfgroup.org. *\n\
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */\n\
\n\n\
#ifndef _H5f90i_gen_H\n\
#define _H5f90i_gen_H\n\
#ifndef H5f90i_gen_H\n\
#define H5f90i_gen_H\n\
\n\
/* This file is automatically generated by H5match_types.c at build time. */\n\
\n\
Expand Down
10 changes: 9 additions & 1 deletion release_docs/RELEASE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,15 @@ New Features

Library:
--------
- None
- H5Epush_ret() now requires a trailing semi-colon

H5Epush_ret() is a function-like macro that has been changed to
contain a `do {} while(0)` loop. Consequently, a trailing semi-colon
is now required to end the `while` statement. Previously, a trailing
semi would work, but was not mandatory. This change was made to allow
clang-format to correctly format the source code.

(SAM - 2021/03/03)


Fortran Library:
Expand Down
106 changes: 53 additions & 53 deletions src/H5B2int.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,15 @@ H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *cur
unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal, unsigned *internal_flags_ptr,
unsigned idx)
{
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr, right_addr; /* Addresses of left & right child nodes */
void * left_child = NULL, *right_child = NULL; /* Pointers to child nodes */
uint16_t * left_nrec, *right_nrec; /* Pointers to child # of records */
uint8_t * left_native, *right_native; /* Pointers to childs' native records */
H5B2_node_ptr_t * left_node_ptrs = NULL,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
uint16_t mid_record; /* Index of "middle" record in current node */
uint16_t old_node_nrec; /* Number of records in internal node split */
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */
void * left_child = NULL, *right_child = NULL; /* Pointers to child nodes */
uint16_t *left_nrec, *right_nrec; /* Pointers to child # of records */
uint8_t * left_native, *right_native; /* Pointers to childs' native records */
H5B2_node_ptr_t *left_node_ptrs = NULL,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
uint16_t mid_record; /* Index of "middle" record in current node */
uint16_t old_node_nrec; /* Number of records in internal node split */
unsigned left_child_flags = H5AC__NO_FLAGS_SET,
right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
Expand Down Expand Up @@ -450,13 +450,13 @@ H5B2_split_root(H5B2_hdr_t *hdr, hid_t dxpl_id)
static herr_t
H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal_t *internal, unsigned idx)
{
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr, right_addr; /* Addresses of left & right child nodes */
void * left_child = NULL, *right_child = NULL; /* Pointers to child nodes */
uint16_t * left_nrec, *right_nrec; /* Pointers to child # of records */
uint8_t * left_native, *right_native; /* Pointers to childs' native records */
H5B2_node_ptr_t * left_node_ptrs = NULL,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */
void * left_child = NULL, *right_child = NULL; /* Pointers to child nodes */
uint16_t *left_nrec, *right_nrec; /* Pointers to child # of records */
uint8_t * left_native, *right_native; /* Pointers to childs' native records */
H5B2_node_ptr_t *left_node_ptrs = NULL,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
hssize_t left_moved_nrec = 0, right_moved_nrec = 0; /* Number of records moved, for internal redistrib */
unsigned left_child_flags = H5AC__NO_FLAGS_SET,
right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
Expand Down Expand Up @@ -709,20 +709,20 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal
unsigned *internal_flags_ptr, unsigned idx)
{
H5B2_node_ptr_t *left_node_ptrs = NULL,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
H5B2_node_ptr_t * middle_node_ptrs = NULL; /* Pointers to childs' node pointer info */
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr, right_addr; /* Addresses of left & right child nodes */
haddr_t middle_addr; /* Address of middle child node */
void * left_child = NULL, *right_child = NULL; /* Pointers to child nodes */
void * middle_child = NULL; /* Pointers to middle child node */
uint16_t * left_nrec, *right_nrec; /* Pointers to child # of records */
uint16_t * middle_nrec; /* Pointers to middle child # of records */
uint8_t * left_native, *right_native; /* Pointers to childs' native records */
uint8_t * middle_native; /* Pointers to middle child's native records */
hssize_t left_moved_nrec = 0, right_moved_nrec = 0; /* Number of records moved, for internal split */
hssize_t middle_moved_nrec = 0; /* Number of records moved, for internal split */
unsigned left_child_flags = H5AC__NO_FLAGS_SET,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
H5B2_node_ptr_t * middle_node_ptrs = NULL; /* Pointers to childs' node pointer info */
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */
haddr_t middle_addr = HADDR_UNDEF; /* Address of middle child node */
void * left_child = NULL, *right_child = NULL; /* Pointers to child nodes */
void * middle_child = NULL; /* Pointers to middle child node */
uint16_t *left_nrec, *right_nrec; /* Pointers to child # of records */
uint16_t *middle_nrec; /* Pointers to middle child # of records */
uint8_t * left_native, *right_native; /* Pointers to childs' native records */
uint8_t * middle_native; /* Pointers to middle child's native records */
hssize_t left_moved_nrec = 0, right_moved_nrec = 0; /* Number of records moved, for internal split */
hssize_t middle_moved_nrec = 0; /* Number of records moved, for internal split */
unsigned left_child_flags = H5AC__NO_FLAGS_SET,
right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
unsigned middle_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
Expand Down Expand Up @@ -1107,16 +1107,16 @@ H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *cur
unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal, unsigned *internal_flags_ptr,
unsigned idx)
{
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr, right_addr; /* Addresses of left & right child nodes */
void * left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */
uint16_t * left_nrec, *right_nrec; /* Pointers to left & right child # of records */
uint8_t * left_native, *right_native; /* Pointers to left & right children's native records */
H5B2_node_ptr_t * left_node_ptrs = NULL,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
unsigned left_child_flags = H5AC__NO_FLAGS_SET,
right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */
void * left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */
uint16_t *left_nrec, *right_nrec; /* Pointers to left & right child # of records */
uint8_t * left_native, *right_native; /* Pointers to left & right children's native records */
H5B2_node_ptr_t *left_node_ptrs = NULL,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
unsigned left_child_flags = H5AC__NO_FLAGS_SET,
right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_NOAPI_NOINIT

Expand Down Expand Up @@ -1273,19 +1273,19 @@ H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *cur
unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal, unsigned *internal_flags_ptr,
unsigned idx)
{
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr, right_addr; /* Addresses of left & right child nodes */
haddr_t middle_addr; /* Address of middle child node */
void * left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */
void * middle_child = NULL; /* Pointer to middle child node */
uint16_t * left_nrec, *right_nrec; /* Pointers to left & right child # of records */
uint16_t * middle_nrec; /* Pointer to middle child # of records */
uint8_t * left_native, *right_native; /* Pointers to left & right children's native records */
uint8_t * middle_native; /* Pointer to middle child's native records */
H5B2_node_ptr_t * left_node_ptrs = NULL,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
H5B2_node_ptr_t *middle_node_ptrs = NULL; /* Pointer to child's node pointer info */
hsize_t middle_moved_nrec; /* Number of records moved, for internal split */
const H5AC_class_t *child_class; /* Pointer to child node's class info */
haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */
haddr_t middle_addr = HADDR_UNDEF; /* Address of middle child node */
void * left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */
void * middle_child = NULL; /* Pointer to middle child node */
uint16_t *left_nrec, *right_nrec; /* Pointers to left & right child # of records */
uint16_t *middle_nrec; /* Pointer to middle child # of records */
uint8_t * left_native, *right_native; /* Pointers to left & right children's native records */
uint8_t * middle_native; /* Pointer to middle child's native records */
H5B2_node_ptr_t *left_node_ptrs = NULL,
*right_node_ptrs = NULL; /* Pointers to childs' node pointer info */
H5B2_node_ptr_t *middle_node_ptrs = NULL; /* Pointer to child's node pointer info */
hsize_t middle_moved_nrec; /* Number of records moved, for internal split */
unsigned left_child_flags = H5AC__NO_FLAGS_SET,
right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
unsigned middle_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
Expand Down
6 changes: 3 additions & 3 deletions src/H5B2public.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
*-------------------------------------------------------------------------
*/

#ifndef _H5B2public_H
#define _H5B2public_H
#ifndef H5B2public_H
#define H5B2public_H

/* Public headers needed by this file */
#include "H5public.h"
Expand All @@ -48,4 +48,4 @@ extern "C" {
}
#endif

#endif /* _H5B2public_H */
#endif /* H5B2public_H */
4 changes: 2 additions & 2 deletions src/H5Bpublic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
*
*-------------------------------------------------------------------------
*/
#ifndef _H5Bpublic_H
#define _H5Bpublic_H
#ifndef H5Bpublic_H
#define H5Bpublic_H

/* Public headers needed by this file */
#include "H5public.h"
Expand Down
4 changes: 2 additions & 2 deletions src/H5C.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3183,12 +3183,12 @@ H5C_mark_entries_as_clean(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_
hbool_t first_flush;
hbool_t have_write_permitted = FALSE;
hbool_t read_only = FALSE;
hbool_t write_permitted;
hbool_t write_permitted = FALSE;
herr_t result;
size_t empty_space;
void * thing;
H5C_cache_entry_t *entry_ptr;
void * ret_value; /* Return value */
void * ret_value = NULL; /* Return value */

FUNC_ENTER_NOAPI(NULL)

Expand Down
2 changes: 1 addition & 1 deletion src/H5Cprivate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

/* Private headers needed by this header */
#include "H5private.h" /* Generic Functions */
#include "H5Fprivate.h" /* File access */
#include "H5Fprivate.h" /* File access */

#define H5C_DO_SANITY_CHECKS 0
#define H5C_DO_EXTREME_SANITY_CHECKS 0
Expand Down
Loading

0 comments on commit 089a6f6

Please sign in to comment.