summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-01-29 12:59:33 (GMT)
committerGitHub <noreply@github.com>2021-01-29 12:59:33 (GMT)
commit674e1f02a3ac37cf3d57df1aee902b7af44f398e (patch)
tree35b83598bb49d92567d70e4f0213344ffaf01f42 /src
parent40dfdee0f5d462ebd1134625a832a7f6a6e5c2a8 (diff)
downloadhdf5-674e1f02a3ac37cf3d57df1aee902b7af44f398e.zip
hdf5-674e1f02a3ac37cf3d57df1aee902b7af44f398e.tar.gz
hdf5-674e1f02a3ac37cf3d57df1aee902b7af44f398e.tar.bz2
1 10 Whitespace changes after clang-format run (#287)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes
Diffstat (limited to 'src')
-rw-r--r--src/H5Fprivate.h10
-rw-r--r--src/H5Fsuper.c12
-rw-r--r--src/H5Oprivate.h2
-rw-r--r--src/H5Spkg.h6
-rw-r--r--src/H5Spoint.c16
-rw-r--r--src/H5Tpublic.h2
-rw-r--r--src/H5Zpublic.h12
-rw-r--r--src/H5public.h10
8 files changed, 35 insertions, 35 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 8442121..7165482 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -587,10 +587,10 @@ typedef struct H5F_t H5F_t;
#define H5F_ACS_CLEAR_STATUS_FLAGS_NAME \
"clear_status_flags" /* Whether to clear superblock status_flags (private property only used by h5clear) \
*/
-#define H5F_ACS_NULL_FSM_ADDR_NAME "null_fsm_addr" /* Nullify addresses of free-space managers */
- /* Private property used only by h5clear */
-#define H5F_ACS_SKIP_EOF_CHECK_NAME "skip_eof_check" /* Skip EOF check */
- /* Private property used only by h5clear */
+#define H5F_ACS_NULL_FSM_ADDR_NAME "null_fsm_addr" /* Nullify addresses of free-space managers */
+/* Private property used only by h5clear */
+#define H5F_ACS_SKIP_EOF_CHECK_NAME "skip_eof_check" /* Skip EOF check */
+/* Private property used only by h5clear */
#define H5F_ACS_USE_MDC_LOGGING_NAME "use_mdc_logging" /* Whether to use metadata cache logging */
#define H5F_ACS_MDC_LOG_LOCATION_NAME "mdc_log_location" /* Name of metadata cache log location */
#define H5F_ACS_START_MDC_LOG_ON_ACCESS_NAME \
@@ -653,7 +653,7 @@ typedef struct H5F_t H5F_t;
must compensate. -QAK \
*/
#define HDF5_BTREE_IK_MAX_ENTRIES 65536 /* 2^16 - 2 bytes for storing entries (children) */
- /* See format specification on version 1 B-trees */
+/* See format specification on version 1 B-trees */
/* Default file space handling strategy */
#define H5F_FILE_SPACE_STRATEGY_DEF H5F_FSPACE_STRATEGY_FSM_AGGR
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 817e707..7d2a27d 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -884,12 +884,12 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
/* Do the same kluge until we know for sure. VC */
#if 1 /* bug fix test code -- tidy this up if all goes well */ /* JRM */
- /* KLUGE ALERT!!
- *
- * H5F__super_ext_write_msg() expects f->shared->sblock to
- * be set -- verify that it is NULL, and then set it.
- * Set it back to NULL when we are done.
- */
+ /* KLUGE ALERT!!
+ *
+ * H5F__super_ext_write_msg() expects f->shared->sblock to
+ * be set -- verify that it is NULL, and then set it.
+ * Set it back to NULL when we are done.
+ */
HDassert(f->shared->sblock == NULL);
f->shared->sblock = sblock;
#endif /* JRM */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 31b3748..32d85e7 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -231,7 +231,7 @@ typedef struct H5O_copy_t {
#define H5O_FSINFO_ID 0x0017 /* File space info message. */
#define H5O_MDCI_MSG_ID 0x0018 /* Metadata Cache Image Message */
#define H5O_UNKNOWN_ID 0x0019 /* Placeholder message ID for unknown message. */
- /* (this should never exist in a file) */
+/* (this should never exist in a file) */
/*
* Note: Must increment H5O_MSG_TYPES in H5Opkg.h and update H5O_msg_class_g
* in H5O.c when creating a new message type. Also bump the value of
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index e0042bd..b6d6423 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -133,10 +133,10 @@ struct H5S_pnt_list_t {
H5S_pnt_node_t *head; /* Pointer to head of point list */
H5S_pnt_node_t *tail; /* Pointer to tail of point list */
- hsize_t last_idx; /* Index of the point after the last returned from H5S__get_select_elem_pointlist() */
+ hsize_t last_idx; /* Index of the point after the last returned from H5S__get_select_elem_pointlist() */
H5S_pnt_node_t *last_idx_pnt; /* Point after the last returned from H5S__get_select_elem_pointlist().
- * If we ever add a way to remove points or add points in the middle of
- * the pointlist we will need to invalidate these fields. */
+ * If we ever add a way to remove points or add points in the middle of
+ * the pointlist we will need to invalidate these fields. */
};
/* Information about hyperslab spans */
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 00e9335..b8067ee 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -834,7 +834,7 @@ H5S__copy_pnt_list(const H5S_pnt_list_t *src, unsigned rank)
H5MM_memcpy(dst->low_bounds, src->low_bounds, (rank * sizeof(hsize_t)));
/* Clear cached iteration point */
- dst->last_idx = 0;
+ dst->last_idx = 0;
dst->last_idx_pnt = NULL;
/* Set return value */
@@ -1361,8 +1361,8 @@ static herr_t
H5S__get_select_elem_pointlist(const H5S_t *space, hsize_t startpoint, hsize_t numpoints, hsize_t *buf)
{
const hsize_t endpoint = startpoint + numpoints; /* Index of last point in iteration */
- H5S_pnt_node_t *node; /* Point node */
- unsigned rank; /* Dataspace rank */
+ H5S_pnt_node_t *node; /* Point node */
+ unsigned rank; /* Dataspace rank */
FUNC_ENTER_STATIC_NOERR
@@ -1373,8 +1373,8 @@ H5S__get_select_elem_pointlist(const H5S_t *space, hsize_t startpoint, hsize_t n
rank = space->extent.rank;
/* Check for cached point at the correct index */
- if(space->select.sel_info.pnt_lst->last_idx_pnt
- && startpoint == space->select.sel_info.pnt_lst->last_idx)
+ if (space->select.sel_info.pnt_lst->last_idx_pnt &&
+ startpoint == space->select.sel_info.pnt_lst->last_idx)
node = space->select.sel_info.pnt_lst->last_idx_pnt;
else {
/* Get the head of the point list */
@@ -1385,7 +1385,7 @@ H5S__get_select_elem_pointlist(const H5S_t *space, hsize_t startpoint, hsize_t n
startpoint--;
node = node->next;
} /* end while */
- } /* end else */
+ } /* end else */
/* Iterate through the node, copying each point's information */
while (node != NULL && numpoints > 0) {
@@ -1396,7 +1396,7 @@ H5S__get_select_elem_pointlist(const H5S_t *space, hsize_t startpoint, hsize_t n
} /* end while */
/* Cached next point in iteration */
- space->select.sel_info.pnt_lst->last_idx = endpoint;
+ space->select.sel_info.pnt_lst->last_idx = endpoint;
space->select.sel_info.pnt_lst->last_idx_pnt = node;
FUNC_LEAVE_NOAPI(SUCCEED)
@@ -2191,7 +2191,7 @@ H5S__point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *of
} /* end else */
/* Clear cached iteration point */
- new_space->select.sel_info.pnt_lst->last_idx = 0;
+ new_space->select.sel_info.pnt_lst->last_idx = 0;
new_space->select.sel_info.pnt_lst->last_idx_pnt = NULL;
/* Number of elements selected will be the same */
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index eb8436a..90af459 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -199,7 +199,7 @@ typedef struct {
/* Opaque information */
#define H5T_OPAQUE_TAG_MAX 256 /* Maximum length of an opaque tag */
- /* This could be raised without too much difficulty */
+/* This could be raised without too much difficulty */
#ifdef __cplusplus
extern "C" {
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 97da13c..8b1d042 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -46,12 +46,12 @@ typedef int H5Z_filter_t;
/* General macros */
#define H5Z_FILTER_ALL 0 /* Symbol to remove all filters in H5Premove_filter */
#define H5Z_MAX_NFILTERS 32 /* Maximum number of filters allowed in a pipeline */
- /* (should probably be allowed to be an
- * unlimited amount, but currently each
- * filter uses a bit in a 32-bit field,
- * so the format would have to be
- * changed to accommodate that)
- */
+/* (should probably be allowed to be an
+ * unlimited amount, but currently each
+ * filter uses a bit in a 32-bit field,
+ * so the format would have to be
+ * changed to accommodate that)
+ */
/* Flags for filter definition (stored) */
#define H5Z_FLAG_DEFMASK 0x00ff /*definition flag mask */
diff --git a/src/H5public.h b/src/H5public.h
index 3d07181..facec9a 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -92,11 +92,11 @@ extern "C" {
#endif
/* Version numbers */
-#define H5_VERS_MAJOR 1 /* For major interface/format changes */
-#define H5_VERS_MINOR 10 /* For minor interface/format changes */
-#define H5_VERS_RELEASE 8 /* For tweaks, bug-fixes, or development */
-#define H5_VERS_SUBRELEASE "1" /* For pre-releases like snap0 */
- /* Empty string for real releases. */
+#define H5_VERS_MAJOR 1 /* For major interface/format changes */
+#define H5_VERS_MINOR 10 /* For minor interface/format changes */
+#define H5_VERS_RELEASE 8 /* For tweaks, bug-fixes, or development */
+#define H5_VERS_SUBRELEASE "1" /* For pre-releases like snap0 */
+/* Empty string for real releases. */
#define H5_VERS_INFO "HDF5 library version: 1.10.8-1" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE)