Skip to content

Commit

Permalink
Reduces overly-pedantic casting in the public headers (#644)
Browse files Browse the repository at this point in the history
* Committing clang-format changes

* Fixes overly pedantic casting in public headers

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
derobins and github-actions[bot] authored May 15, 2021
1 parent 9fb2c24 commit 6c170c4
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions src/H5Dpublic.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
/*****************/

/* Macros used to "unset" chunk cache configuration parameters */
#define H5D_CHUNK_CACHE_NSLOTS_DEFAULT ((size_t)-1)
#define H5D_CHUNK_CACHE_NBYTES_DEFAULT ((size_t)-1)
#define H5D_CHUNK_CACHE_W0_DEFAULT (-1.0f)
#define H5D_CHUNK_CACHE_NSLOTS_DEFAULT SIZE_MAX
#define H5D_CHUNK_CACHE_NBYTES_DEFAULT SIZE_MAX
#define H5D_CHUNK_CACHE_W0_DEFAULT (-1.0)

/* Bit flags for the H5Pset_chunk_opts() and H5Pget_chunk_opts() */
#define H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS (0x0002u)
Expand All @@ -46,11 +46,11 @@
typedef enum H5D_layout_t {
H5D_LAYOUT_ERROR = -1,

H5D_COMPACT = 0, /**< raw data is very small */
H5D_CONTIGUOUS = 1, /**< the default */
H5D_CHUNKED = 2, /**< slow and fancy */
H5D_VIRTUAL = 3, /**< actual data is stored in other datasets */
H5D_NLAYOUTS = 4 /**< this one must be last! */
H5D_COMPACT = 0, /**< raw data is very small */
H5D_CONTIGUOUS = 1, /**< the default */
H5D_CHUNKED = 2, /**< slow and fancy */
H5D_VIRTUAL = 3, /**< actual data is stored in other datasets */
H5D_NLAYOUTS = 4 /**< this one must be last! */
} H5D_layout_t;
//! <!-- [H5D_layout_t_snip] -->

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

/* Default value for "no event set" / synchronous execution */
#define H5ES_NONE (hid_t)0
#define H5ES_NONE 0 /* (hid_t) */

/* Special "wait" timeout values */
#define H5ES_WAIT_FOREVER (UINT64_MAX) /* Wait until all operations complete */
Expand Down
2 changes: 1 addition & 1 deletion src/H5Epublic.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "H5Ipublic.h"

/* Value for the default error stack */
#define H5E_DEFAULT (hid_t)0
#define H5E_DEFAULT 0 /* (hid_t) */

/**
* Different kinds of error information
Expand Down
4 changes: 2 additions & 2 deletions src/H5Fpublic.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
(0x0020u) /**< Restrict search to objects opened through current file ID \
(as opposed to objects opened through any file ID accessing this file) */

#define H5F_FAMILY_DEFAULT (hsize_t)0
#define H5F_FAMILY_DEFAULT 0 /* (hsize_t) */

#ifdef H5_HAVE_PARALLEL
/**
Expand All @@ -108,7 +108,7 @@ typedef enum H5F_scope_t {
/**
* Unlimited file size for H5Pset_external()
*/
#define H5F_UNLIMITED ((hsize_t)(-1L))
#define H5F_UNLIMITED HSIZE_UNDEF

/**
* How does file close behave?
Expand Down
4 changes: 2 additions & 2 deletions src/H5Lpublic.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
*
* The maximum length of a link's name is encoded in a 32-bit unsigned integer.
*/
#define H5L_MAX_LINK_NAME_LEN ((uint32_t)(-1)) /* (4GB - 1) */
#define H5L_MAX_LINK_NAME_LEN UINT32_MAX

/**
* \brief Macro to indicate operation occurs on same location
*/
#define H5L_SAME_LOC (hid_t)0
#define H5L_SAME_LOC 0 /* (hid_t) */

/**
* \brief Current version of the H5L_class_t struct
Expand Down
2 changes: 1 addition & 1 deletion src/H5Ppublic.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
#define H5P_CRT_ORDER_INDEXED 0x0002

/* Default value for all property list classes */
#define H5P_DEFAULT (hid_t)0
#define H5P_DEFAULT 0 /* (hid_t) */

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion src/H5Spublic.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "H5Ipublic.h"

/* Define atomic datatypes */
#define H5S_ALL (hid_t)0
#define H5S_ALL 0 /* (hid_t) */
#define H5S_UNLIMITED HSIZE_UNDEF

/* Define user-level maximum number of dimensions */
Expand Down
2 changes: 1 addition & 1 deletion src/H5Tpublic.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ typedef struct {
* Indicate that a string is variable length (null-terminated in C, instead of
* fixed length)
*/
#define H5T_VARIABLE ((size_t)(-1))
#define H5T_VARIABLE SIZE_MAX

/* Opaque information */
/**
Expand Down

0 comments on commit 6c170c4

Please sign in to comment.