summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.clang-format18
-rw-r--r--.github/workflows/clang-format-check.yml2
-rw-r--r--c++/test/tfilter.cpp2
-rw-r--r--examples/ph5example.c2
-rw-r--r--fortran/src/H5Pf.c2
-rw-r--r--src/H5.c6
-rw-r--r--src/H5AC.c18
-rw-r--r--src/H5ACmpio.c8
-rw-r--r--src/H5ACproxy_entry.c8
-rw-r--r--src/H5Adense.c2
-rw-r--r--src/H5Aint.c2
-rw-r--r--src/H5Apublic.h24
-rw-r--r--src/H5B2.c4
-rw-r--r--src/H5B2cache.c12
-rw-r--r--src/H5C.c50
-rw-r--r--src/H5CX.c22
-rw-r--r--src/H5Cdbg.c6
-rw-r--r--src/H5Cimage.c16
-rw-r--r--src/H5Dchunk.c6
-rw-r--r--src/H5Defl.c6
-rw-r--r--src/H5Dint.c8
-rw-r--r--src/H5Dmpio.c4
-rw-r--r--src/H5Dvirtual.c4
-rw-r--r--src/H5E.c4
-rw-r--r--src/H5EAcache.c20
-rw-r--r--src/H5EAtest.c2
-rw-r--r--src/H5Eint.c14
-rw-r--r--src/H5Epkg.h4
-rw-r--r--src/H5F.c2
-rw-r--r--src/H5FAcache.c12
-rw-r--r--src/H5FAtest.c2
-rw-r--r--src/H5FDcore.c14
-rw-r--r--src/H5FDdirect.c4
-rw-r--r--src/H5FDhdfs.c14
-rw-r--r--src/H5FDlog.c16
-rw-r--r--src/H5FDmirror.c4
-rw-r--r--src/H5FDmpio.c4
-rw-r--r--src/H5FDsec2.c8
-rw-r--r--src/H5FDspace.c2
-rw-r--r--src/H5FDsplitter.c2
-rw-r--r--src/H5FDstdio.c12
-rw-r--r--src/H5FS.c4
-rw-r--r--src/H5FScache.c11
-rw-r--r--src/H5Fint.c2
-rw-r--r--src/H5Fprivate.h27
-rw-r--r--src/H5Fpublic.h244
-rw-r--r--src/H5Fsuper.c2
-rw-r--r--src/H5Gent.c2
-rw-r--r--src/H5Gnode.c2
-rw-r--r--src/H5Gprivate.h4
-rw-r--r--src/H5Groot.c4
-rw-r--r--src/H5Gtraverse.c2
-rw-r--r--src/H5HFcache.c4
-rw-r--r--src/H5HG.c2
-rw-r--r--src/H5Iint.c7
-rw-r--r--src/H5Ipkg.h8
-rw-r--r--src/H5Ipublic.h4
-rw-r--r--src/H5MF.c10
-rw-r--r--src/H5MFsection.c4
-rw-r--r--src/H5MM.c27
-rw-r--r--src/H5MMprivate.h2
-rw-r--r--src/H5Ocache.c6
-rw-r--r--src/H5Odtype.c2
-rw-r--r--src/H5Oint.c40
-rw-r--r--src/H5Opkg.h4
-rw-r--r--src/H5Oprivate.h10
-rw-r--r--src/H5Opublic.h24
-rw-r--r--src/H5Oshared.h10
-rw-r--r--src/H5PLpath.c2
-rw-r--r--src/H5PLpublic.h4
-rw-r--r--src/H5Pdcpl.c2
-rw-r--r--src/H5Pfapl.c2
-rw-r--r--src/H5Pint.c4
-rw-r--r--src/H5Ppkg.h3
-rw-r--r--src/H5Ppublic.h104
-rw-r--r--src/H5SM.c4
-rw-r--r--src/H5Shyper.c6
-rw-r--r--src/H5Spkg.h42
-rw-r--r--src/H5Spoint.c16
-rw-r--r--src/H5Spublic.h12
-rw-r--r--src/H5T.c2
-rw-r--r--src/H5TS.c18
-rw-r--r--src/H5TSprivate.h4
-rw-r--r--src/H5Tpkg.h3
-rw-r--r--src/H5Tprivate.h2
-rw-r--r--src/H5Tpublic.h188
-rw-r--r--src/H5Tref.c10
-rw-r--r--src/H5Tvlen.c6
-rw-r--r--src/H5VL.c6
-rw-r--r--src/H5VLcallback.c2
-rw-r--r--src/H5VLint.c12
-rw-r--r--src/H5VLnative.c36
-rw-r--r--src/H5VLprivate.h4
-rw-r--r--src/H5VLpublic.h26
-rw-r--r--src/H5VM.c2
-rw-r--r--src/H5Z.c14
-rw-r--r--src/H5Zpublic.h16
-rw-r--r--src/H5Zshuffle.c10
-rw-r--r--src/H5Ztrans.c30
-rw-r--r--src/H5detect.c2
-rw-r--r--src/H5make_libsettings.c2
-rw-r--r--src/H5private.h76
-rw-r--r--src/H5public.h26
-rw-r--r--src/H5system.c2
-rw-r--r--src/H5timer.c6
-rw-r--r--test/accum.c2
-rw-r--r--test/btree2.c4
-rw-r--r--test/cache.c10
-rw-r--r--test/cache_common.h3
-rw-r--r--test/cache_tagging.c52
-rw-r--r--test/chunk_info.c2
-rw-r--r--test/cross_read.c8
-rw-r--r--test/dsets.c30
-rw-r--r--test/dt_arith.c4
-rw-r--r--test/dtypes.c4
-rw-r--r--test/earray.c6
-rw-r--r--test/error_test.c2
-rw-r--r--test/farray.c2
-rw-r--r--test/fheap.c63
-rw-r--r--test/filter_plugin.c4
-rw-r--r--test/gen_bad_ohdr.c2
-rw-r--r--test/gen_bogus.c2
-rw-r--r--test/gen_cross.c4
-rw-r--r--test/h5test.c2
-rw-r--r--test/hdfs.c3
-rw-r--r--test/links.c18
-rw-r--r--test/mount.c2
-rw-r--r--test/objcopy.c6
-rw-r--r--test/s3comms.c6
-rw-r--r--test/set_extent.c4
-rw-r--r--test/stab.c2
-rw-r--r--test/swmr.c4
-rw-r--r--test/swmr_remove_reader.c2
-rw-r--r--test/swmr_sparse_writer.c2
-rw-r--r--test/tattr.c8
-rw-r--r--test/tfile.c2
-rw-r--r--test/th5o.c2
-rw-r--r--test/thread_id.c2
-rw-r--r--test/tmisc.c26
-rw-r--r--test/tsohm.c10
-rw-r--r--test/ttsafe.c2
-rw-r--r--test/vds.c2
-rw-r--r--test/vfd.c16
-rw-r--r--test/vol.c19
-rw-r--r--testpar/t_2Gio.c6
-rw-r--r--testpar/t_cache.c4
-rw-r--r--testpar/t_filter_read.c2
-rw-r--r--testpar/t_shapesame.c2
-rw-r--r--tools/lib/h5diff.c10
-rw-r--r--tools/lib/h5diff_array.c2
-rw-r--r--tools/lib/h5tools_str.c4
-rw-r--r--tools/lib/h5tools_utils.c12
-rw-r--r--tools/libtest/h5tools_test_utils.c6
-rw-r--r--tools/src/h5dump/h5dump.h2
-rw-r--r--tools/src/h5dump/h5dump_extern.h2
-rw-r--r--tools/test/perform/perf.c2
-rw-r--r--tools/test/perform/pio_standalone.h18
-rw-r--r--tools/test/perform/sio_standalone.h18
158 files changed, 1010 insertions, 970 deletions
diff --git a/.clang-format b/.clang-format
index 5b7d76f..34b7563 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,9 +1,12 @@
---
Language: Cpp
BasedOnStyle: LLVM
-AlignConsecutiveMacros: true
AlignConsecutiveAssignments: true
+#llvm11: AlignConsecutiveBitFields: false
AlignConsecutiveDeclarations: true
+AlignConsecutiveMacros: true
+#llvm10-11: AlignOperands: true - Align
+#llvm11: AllowShortEnumsOnASingleLine: true
AlwaysBreakAfterReturnType: AllDefinitions
# Can enable the following section when llvm 12.x is out
#AttributeMacros:
@@ -20,8 +23,11 @@ AlwaysBreakAfterReturnType: AllDefinitions
# - H5_ATTR_FALLTHROUGH
BraceWrapping:
AfterFunction: true
+ #llvm10-11: AfterControlStatement: false - Never
BeforeCatch: true
BeforeElse: true
+ #llvm11: BeforeLambdaBody: false
+ #llvm11: BeforeWhile: false
BreakBeforeBraces: Stroustrup
BreakAfterJavaFieldAnnotations: true
BreakStringLiterals: true
@@ -44,11 +50,15 @@ IncludeCategories:
SortPriority: 0
IncludeIsMainRegex: '(public)?$'
IndentCaseLabels: true
+#llvm11: IndentCaseBlocks: false
IndentGotoLabels: false
+#llvm11: IndentExternBlock: AfterExternBlock
IndentWidth: 4
+#llvm11: InsertTrailingCommas: None
MacroBlockBegin: "^BEGIN_FUNC"
MacroBlockEnd: "^END_FUNC"
ObjCBlockIndentWidth: 4
+#llvm11: ObjCBreakBeforeNestedBlockParam: true
ReflowComments: true
SortIncludes: false
StatementMacros:
@@ -74,5 +84,11 @@ StatementMacros:
- H5_GCC_DIAG_OFF
- H5_GCC_DIAG_ON
- CATCH
+#llvm10: TypenameMacros:
+#llvm10: - STACK_OF
+#llvm10: - LIST
+#llvm11: WhitespaceSensitiveMacros:
+#llvm11: - STRINGIZE
+#llvm11: - PP_STRINGIZE
...
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
index 6bf522c..230a341 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -8,7 +8,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Run clang-format style check for C programs.
- uses: DoozyX/clang-format-lint-action@v0.10
+ uses: DoozyX/clang-format-lint-action@v0.11
with:
source: '.'
extensions: 'c,h,cpp,hpp'
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index e583c3b..e7788e5 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -222,7 +222,7 @@ test_szip_filter(H5File &file1)
SKIPPED();
}
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
SUBTEST("szip filter");
SKIPPED();
H5std_string fname = file1.getFileName();
diff --git a/examples/ph5example.c b/examples/ph5example.c
index da777a9..06c8919 100644
--- a/examples/ph5example.c
+++ b/examples/ph5example.c
@@ -1087,7 +1087,7 @@ finish:
return (nerrors);
}
-#else /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
/* dummy program since H5_HAVE_PARALLE is not configured in */
int
main(void)
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 441af59..d52f537 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -505,7 +505,7 @@ h5pget_version_c(hid_t_f H5_ATTR_UNUSED *prp_id, int_f *boot, int_f *freelist, i
return 0;
}
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
int_f
h5pget_version_c(hid_t_f *prp_id, int_f *boot, int_f *freelist, int_f *stab, int_f *shhdr)
/******/
diff --git a/src/H5.c b/src/H5.c
index d315950..81c7eb7 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -101,12 +101,12 @@ DESCRIPTION
herr_t
H5__init_package(void)
{
- herr_t ret_value = SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT
/* Run the library initialization routine, if it hasn't already ran */
- if (!H5_INIT_GLOBAL && !H5_TERM_GLOBAL) { \
+ if (!H5_INIT_GLOBAL && !H5_TERM_GLOBAL) {
if (H5_init_library() < 0)
HGOTO_ERROR(H5E_LIB, H5E_CANTINIT, FAIL, "unable to initialize library")
} /* end if */
@@ -137,7 +137,7 @@ H5_init_library(void)
/* Set the 'library initialized' flag as early as possible, to avoid
* possible re-entrancy.
*/
- H5_INIT_GLOBAL = TRUE; \
+ H5_INIT_GLOBAL = TRUE;
FUNC_ENTER_NOAPI(FAIL)
diff --git a/src/H5AC.c b/src/H5AC.c
index aab99e5..7e39f09 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -374,7 +374,7 @@ H5AC_create(const H5F_t *f, H5AC_cache_config_t *config_ptr, H5AC_cache_image_co
H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE, (H5AC_NTYPES - 1),
H5AC_class_s, H5AC__check_if_write_permitted, TRUE, NULL, NULL);
#ifdef H5_HAVE_PARALLEL
- } /* end else */
+ } /* end else */
#endif /* H5_HAVE_PARALLEL */
if (NULL == f->shared->cache)
@@ -432,7 +432,7 @@ done:
aux_ptr = H5FL_FREE(H5AC_aux_t, aux_ptr);
} /* end if */
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
FUNC_LEAVE_NOAPI(ret_value)
} /* H5AC_create() */
@@ -466,7 +466,7 @@ H5AC_dest(H5F_t *f)
hbool_t curr_logging; /* TRUE if currently logging */
#ifdef H5_HAVE_PARALLEL
H5AC_aux_t *aux_ptr = NULL;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -585,7 +585,7 @@ H5AC_dest(H5F_t *f)
aux_ptr->magic = 0;
aux_ptr = H5FL_FREE(H5AC_aux_t, aux_ptr);
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
done:
@@ -1104,7 +1104,7 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
{
#ifdef H5_HAVE_PARALLEL
H5AC_aux_t *aux_ptr;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -1414,7 +1414,7 @@ H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *udata, unsi
#ifdef H5_HAVE_PARALLEL
HDassert(0 == (flags &
(unsigned)(~(H5C__READ_ONLY_FLAG | H5C__FLUSH_LAST_FLAG | H5C__FLUSH_COLLECTIVELY_FLAG))));
-#else /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
HDassert(0 == (flags & (unsigned)(~(H5C__READ_ONLY_FLAG | H5C__FLUSH_LAST_FLAG))));
#endif /* H5_HAVE_PARALLEL */
@@ -1631,7 +1631,7 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing, un
hbool_t deleted;
#ifdef H5_HAVE_PARALLEL
H5AC_aux_t *aux_ptr = NULL;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -1674,7 +1674,7 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing, un
if (deleted && aux_ptr->mpi_rank == 0)
if (H5AC__log_deleted_entry((H5AC_info_t *)thing) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "H5AC__log_deleted_entry() failed")
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
if (H5C_unprotect(f, addr, thing, flags) < 0)
@@ -2163,7 +2163,7 @@ H5AC__check_if_write_permitted(const H5F_t
write_permitted = aux_ptr->write_permitted;
else
write_permitted = FALSE;
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
*write_permitted_ptr = write_permitted;
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c
index 1d24441..a806b35 100644
--- a/src/H5ACmpio.c
+++ b/src/H5ACmpio.c
@@ -760,7 +760,7 @@ H5AC__log_dirtied_entry(const H5AC_info_t *entry_ptr)
#if H5AC_DEBUG_DIRTY_BYTES_CREATION
aux_ptr->unprotect_dirty_bytes += entry_ptr->size;
aux_ptr->unprotect_dirty_bytes_updates += 1;
-#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
} /* end if */
/* the entry is dirty. If it exists on the cleaned entries list,
@@ -776,7 +776,7 @@ H5AC__log_dirtied_entry(const H5AC_info_t *entry_ptr)
aux_ptr->unprotect_dirty_bytes += entry_ptr->size;
aux_ptr->unprotect_dirty_bytes_updates += 1;
#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
- } /* end else */
+ } /* end else */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1090,7 +1090,7 @@ H5AC__log_moved_entry(const H5F_t *f, haddr_t old_addr, haddr_t new_addr)
#if H5AC_DEBUG_DIRTY_BYTES_CREATION
aux_ptr->move_dirty_bytes += entry_size;
aux_ptr->move_dirty_bytes_updates += 1;
-#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
} /* end else */
/* insert / reinsert the entry in the dirty slist */
@@ -1104,7 +1104,7 @@ H5AC__log_moved_entry(const H5F_t *f, haddr_t old_addr, haddr_t new_addr)
aux_ptr->move_dirty_bytes += entry_size;
aux_ptr->move_dirty_bytes_updates += 1;
#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
- } /* end else-if */
+ } /* end else-if */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5ACproxy_entry.c b/src/H5ACproxy_entry.c
index 4426189..76e885f 100644
--- a/src/H5ACproxy_entry.c
+++ b/src/H5ACproxy_entry.c
@@ -521,7 +521,7 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
case H5AC_NOTIFY_ACTION_AFTER_LOAD:
#ifdef NDEBUG
HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "invalid notify action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Invalid action?!?");
#endif /* NDEBUG */
break;
@@ -529,7 +529,7 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
case H5AC_NOTIFY_ACTION_AFTER_FLUSH:
#ifdef NDEBUG
HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "invalid notify action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Invalid action?!?");
#endif /* NDEBUG */
break;
@@ -605,10 +605,10 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "unknown notify action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Adense.c b/src/H5Adense.c
index 1efe45d..3d99202 100644
--- a/src/H5Adense.c
+++ b/src/H5Adense.c
@@ -1100,7 +1100,7 @@ H5A__dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
HDassert("unknown attribute op type" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unsupported attribute op type")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
/* Release the space allocated for the attribute */
diff --git a/src/H5Aint.c b/src/H5Aint.c
index e940d05..addd70e 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -1812,7 +1812,7 @@ H5A__attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip, hsize_t *l
HDassert("unknown attribute op type" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unsupported attribute op type")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
/* Increment the number of entries passed through */
diff --git a/src/H5Apublic.h b/src/H5Apublic.h
index 3b836e7..c4403a0 100644
--- a/src/H5Apublic.h
+++ b/src/H5Apublic.h
@@ -65,7 +65,7 @@ extern "C" {
*
* \see H5Acreate(), H5Aopen()
*/
-H5_DLL herr_t H5Aclose(hid_t attr_id);
+H5_DLL herr_t H5Aclose(hid_t attr_id);
/* --------------------------------------------------------------------------*/
/**
* \ingroup H5A
@@ -113,8 +113,8 @@ H5_DLL herr_t H5Aclose(hid_t attr_id);
* \see H5Aclose()
*
*/
-H5_DLL hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id,
- hid_t aapl_id);
+H5_DLL hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id,
+ hid_t aapl_id);
/*--------------------------------------------------------------------------*/
/**
* \ingroup H5A
@@ -162,8 +162,8 @@ H5_DLL hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hi
* \since 1.8.0
*
*/
-H5_DLL hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id,
- hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id);
+H5_DLL hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id,
+ hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id);
/*--------------------------------------------------------------------------*/
/**
* \ingroup H5A
@@ -194,7 +194,7 @@ H5_DLL hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char
*
* \see H5Aclose(), H5Acreate()
*/
-H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id);
+H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id);
/*--------------------------------------------------------------------------*/
/**
* \ingroup H5A
@@ -240,8 +240,8 @@ H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id);
* \since 1.8.0
*
*/
-H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
- hsize_t n, hid_t aapl_id, hid_t lapl_id);
+H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+ hsize_t n, hid_t aapl_id, hid_t lapl_id);
/*--------------------------------------------------------------------------*/
/**
* \ingroup H5A
@@ -283,8 +283,8 @@ H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx
* \since 1.8.0
*
*/
-H5_DLL hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id,
- hid_t lapl_id);
+H5_DLL hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id,
+ hid_t lapl_id);
/*-------------------------------------------------------------------------- */
/**
* \ingroup H5A
@@ -311,8 +311,8 @@ H5_DLL hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *a
*
* \see H5Awrite()
*
-*/
-H5_DLL herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf);
+ */
+H5_DLL herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf);
/*--------------------------------------------------------------------------*/
/**
* \ingroup H5A
diff --git a/src/H5B2.c b/src/H5B2.c
index ecf95cb..2b889dc 100644
--- a/src/H5B2.c
+++ b/src/H5B2.c
@@ -1313,9 +1313,9 @@ H5B2_modify(H5B2_t *bt2, void *udata, H5B2_modify_t op, void *op_data)
*/
#ifdef OLD_WAY
HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "key not found in leaf node")
-#else /* OLD_WAY */
+#else /* OLD_WAY */
HGOTO_DONE(FAIL)
-#endif /* OLD_WAY */
+#endif /* OLD_WAY */
} /* end if */
else {
/* Make callback for current record */
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index 106542e..ce91085 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -486,9 +486,9 @@ H5B2__cache_hdr_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
@@ -904,9 +904,9 @@ H5B2__cache_int_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
@@ -1283,9 +1283,9 @@ H5B2__cache_leaf_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
diff --git a/src/H5C.c b/src/H5C.c
index fa4a8bf..db3933b 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -576,7 +576,7 @@ void
H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr,
#ifndef NDEBUG
int32_t version,
-#else /* NDEBUG */
+#else /* NDEBUG */
int32_t H5_ATTR_UNUSED version,
#endif /* NDEBUG */
double hit_rate, enum H5C_resize_status status, size_t old_max_cache_size,
@@ -806,7 +806,7 @@ H5C_prep_for_file_close(H5F_t *f)
*/
if (H5C__serialize_cache(f) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_CANTSERIALIZE, FAIL, "serialization of the cache failed")
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
done:
@@ -1310,7 +1310,7 @@ H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, u
hbool_t flush_last;
#ifdef H5_HAVE_PARALLEL
hbool_t coll_access = FALSE; /* whether access to the cache entry is done collectively */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
hbool_t set_flush_marker;
hbool_t write_permitted = TRUE;
size_t empty_space;
@@ -2092,7 +2092,7 @@ H5C_resize_entry(void *thing, size_t new_size)
H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->coll_list_len), (cache_ptr->coll_list_size),
(entry_ptr->size), (new_size))
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* update statistics just before changing the entry size */
H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size);
@@ -2228,7 +2228,7 @@ H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsign
hbool_t flush_last;
#ifdef H5_HAVE_PARALLEL
hbool_t coll_access = FALSE; /* whether access to the cache entry is done collectively */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
hbool_t write_permitted;
hbool_t was_loaded = FALSE; /* Whether the entry was loaded as a result of the protect */
size_t empty_space;
@@ -2348,7 +2348,7 @@ H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsign
H5C__MOVE_TO_TOP_IN_COLL_LIST(cache_ptr, entry_ptr, NULL)
} /* end else-if */
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
#if H5C_DO_TAGGING_SANITY_CHECKS
{
@@ -3359,7 +3359,7 @@ H5C_unprotect(H5F_t *f, haddr_t addr, void *thing, unsigned flags)
if (!dirtied)
clear_entry = TRUE;
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
if (!entry_ptr->is_protected)
@@ -3538,7 +3538,7 @@ H5C_unprotect(H5F_t *f, haddr_t addr, void *thing, unsigned flags)
HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Can't clear entry")
} /* end else if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
}
H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)
@@ -3899,7 +3899,7 @@ H5C_create_flush_dependency(void *parent_thing, void *child_thing)
for (u = 0; u < child_entry->flush_dep_nparents; u++)
HDassert(child_entry->flush_dep_parent[u] != parent_entry);
- } /* end block */
+ } /* end block */
#endif /* NDEBUG */
/* More sanity checks */
@@ -5823,7 +5823,7 @@ H5C__flush_invalidate_ring(H5F_t *f, H5C_ring_t ring, unsigned flags)
HDassert(cache_ptr->slist_size ==
(size_t)((ssize_t)initial_slist_size + cache_ptr->slist_size_increase));
} /* end if */
-#endif /* H5C_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
/* Since we are doing a destroy, we must make a pass through
* the hash table and try to flush - destroy all entries that
@@ -6321,7 +6321,7 @@ H5C__flush_ring(H5F_t *f, H5C_ring_t ring, unsigned flags)
HDassert(cache_ptr->slist_ring_len[ring] == 0);
HDassert(cache_ptr->slist_ring_size[ring] == 0);
- } /* end if */
+ } /* end if */
#endif /* H5C_DO_SANITY_CHECKS */
done:
@@ -6763,7 +6763,7 @@ H5C__flush_single_entry(H5F_t *f, H5C_cache_entry_t *entry_ptr, unsigned flags)
H5C__REMOVE_FROM_COLL_LIST(cache_ptr, entry_ptr, FAIL)
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
H5C__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, FAIL)
@@ -7130,7 +7130,7 @@ H5C__load_entry(H5F_t *f,
int mpi_rank = 0; /* MPI process rank */
MPI_Comm comm = MPI_COMM_NULL; /* File MPI Communicator */
int mpi_code; /* MPI error code */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
void *ret_value = NULL; /* Return value */
FUNC_ENTER_STATIC
@@ -7176,7 +7176,7 @@ H5C__load_entry(H5F_t *f,
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "Can't get MPI rank")
if ((comm = H5F_mpi_get_comm(f)) == MPI_COMM_NULL)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "get_comm request failed")
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
/* Get the on-disk entry image */
@@ -7206,7 +7206,7 @@ H5C__load_entry(H5F_t *f,
image = (uint8_t *)new_image;
#if H5C_DO_MEMORY_SANITY_CHECKS
H5MM_memcpy(image + len, H5C_IMAGE_SANITY_VALUE, H5C_IMAGE_EXTRA_SPACE);
-#endif /* H5C_DO_MEMORY_SANITY_CHECKS */
+#endif /* H5C_DO_MEMORY_SANITY_CHECKS */
} /* end if */
#ifdef H5_HAVE_PARALLEL
@@ -7227,7 +7227,7 @@ H5C__load_entry(H5F_t *f,
if (MPI_SUCCESS != (mpi_code = MPI_Bcast(image, buf_size, MPI_BYTE, 0, comm)))
HMPI_GOTO_ERROR(NULL, "MPI_Bcast failed", mpi_code)
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* If the entry could be read speculatively and the length is still
* changing, check for updating the actual size
@@ -7275,9 +7275,9 @@ H5C__load_entry(H5F_t *f,
(mpi_code = MPI_Bcast(image + len, buf_size, MPI_BYTE, 0, comm)))
HMPI_GOTO_ERROR(NULL, "MPI_Bcast failed", mpi_code)
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
- } /* end if */
- } /* end if (actual_len != len) */
+#endif /* H5_HAVE_PARALLEL */
+ } /* end if */
+ } /* end if (actual_len != len) */
else {
/* The length has stabilized */
len_changed = FALSE;
@@ -8533,7 +8533,7 @@ H5C__serialize_cache(H5F_t *f)
scan_ptr = scan_ptr->il_next;
} /* end while */
} /* end block */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
/* set cache_ptr->serialization_in_progress to TRUE, and back
* to FALSE at the end of the function. Must maintain this flag
@@ -8599,7 +8599,7 @@ H5C__serialize_cache(H5F_t *f)
scan_ptr = scan_ptr->il_next;
} /* end while */
} /* end block */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
done:
cache_ptr->serialization_in_progress = FALSE;
@@ -8776,7 +8776,7 @@ H5C__serialize_ring(H5F_t *f, H5C_ring_t ring)
#ifndef NDEBUG
/* Increment serialization counter (to detect multiple serializations) */
entry_ptr->serialization_count++;
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end if */
} /* end if */
@@ -8845,7 +8845,7 @@ H5C__serialize_ring(H5F_t *f, H5C_ring_t ring)
#ifndef NDEBUG
/* Increment serialization counter (to detect multiple serializations) */
entry_ptr->serialization_count++;
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end if */
} /* end if */
else {
@@ -8910,7 +8910,7 @@ H5C__serialize_single_entry(H5F_t *f, H5C_t *cache_ptr, H5C_cache_entry_t *entry
H5MM_memcpy(((uint8_t *)entry_ptr->image_ptr) + image_size, H5C_IMAGE_SANITY_VALUE,
H5C_IMAGE_EXTRA_SPACE);
#endif /* H5C_DO_MEMORY_SANITY_CHECKS */
- } /* end if */
+ } /* end if */
/* Generate image for entry */
if (H5C__generate_image(f, cache_ptr, entry_ptr) < 0)
@@ -9217,7 +9217,7 @@ H5C_remove_entry(void *_entry)
if (entry->coll_access) {
entry->coll_access = FALSE;
H5C__REMOVE_FROM_COLL_LIST(cache, entry, FAIL)
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
H5C__UPDATE_RP_FOR_EVICTION(cache, entry, FAIL)
diff --git a/src/H5CX.c b/src/H5CX.c
index 62a7283..478df9b 100644
--- a/src/H5CX.c
+++ b/src/H5CX.c
@@ -213,7 +213,7 @@ typedef struct H5CX_t {
MPI_Datatype ftype; /* MPI datatype for file, when using collective I/O */
hbool_t mpi_file_flushing; /* Whether an MPI-opened file is being flushed */
hbool_t rank0_bcast; /* Whether a dataset meets read-with-rank0-and-bcast requirements */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* Cached DXPL properties */
size_t max_temp_buf; /* Maximum temporary buffer size */
@@ -241,8 +241,8 @@ typedef struct H5CX_t {
hbool_t mpio_chunk_opt_num_valid; /* Whether collective chunk threshold is valid */
unsigned mpio_chunk_opt_ratio; /* Collective chunk ratio (H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME) */
hbool_t mpio_chunk_opt_ratio_valid; /* Whether collective chunk ratio is valid */
-#endif /* H5_HAVE_PARALLEL */
- H5Z_EDC_t err_detect; /* Error detection info (H5D_XFER_EDC_NAME) */
+#endif /* H5_HAVE_PARALLEL */
+ H5Z_EDC_t err_detect; /* Error detection info (H5D_XFER_EDC_NAME) */
hbool_t err_detect_valid; /* Whether error detection info is valid */
H5Z_cb_t filter_cb; /* Filter callback function (H5D_XFER_FILTER_CB_NAME) */
hbool_t filter_cb_valid; /* Whether filter callback function is valid */
@@ -298,8 +298,8 @@ typedef struct H5CX_t {
(H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME) */
hbool_t
mpio_coll_rank0_bcast_set; /* Whether instrumented "collective chunk multi ratio ind" value is set */
-#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
+#endif /* H5_HAVE_PARALLEL */
/* Cached LCPL properties */
H5T_cset_t encoding; /* Link name character encoding */
@@ -373,7 +373,7 @@ typedef struct H5CX_dxpl_cache_t {
mpio_chunk_opt_mode; /* Collective chunk option (H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME) */
unsigned mpio_chunk_opt_num; /* Collective chunk thrreshold (H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME) */
unsigned mpio_chunk_opt_ratio; /* Collective chunk ratio (H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME) */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
H5Z_EDC_t err_detect; /* Error detection info (H5D_XFER_EDC_NAME) */
H5Z_cb_t filter_cb; /* Filter callback function (H5D_XFER_FILTER_CB_NAME) */
H5Z_data_xform_t * data_transform; /* Data transform info (H5D_XFER_XFORM_NAME) */
@@ -437,7 +437,7 @@ hbool_t H5_PKG_INIT_VAR = FALSE;
#ifndef H5_HAVE_THREADSAFE
static H5CX_node_t *H5CX_head_g = NULL; /* Pointer to head of context stack */
-#endif /* H5_HAVE_THREADSAFE */
+#endif /* H5_HAVE_THREADSAFE */
/* Define a "default" dataset transfer property list cache structure to use for default DXPLs */
static H5CX_dxpl_cache_t H5CX_def_dxpl_cache;
@@ -1381,8 +1381,8 @@ H5CX_set_apl(hid_t *acspl_id, const H5P_libclass_t *libclass,
if (H5P_USER_TRUE == md_coll_read)
is_collective = TRUE;
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
- } /* end else */
+#endif /* H5_HAVE_PARALLEL */
+ } /* end else */
#ifdef H5_HAVE_PARALLEL
/* Check for collective operation */
@@ -1408,7 +1408,7 @@ H5CX_set_apl(hid_t *acspl_id, const H5P_libclass_t *libclass,
MPI_Barrier(mpi_comm);
} /* end if */
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1469,7 +1469,7 @@ H5CX_set_loc(hid_t
done:
FUNC_LEAVE_NOAPI(ret_value)
-#else /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Cdbg.c b/src/H5Cdbg.c
index 3cd6e6c..a8917ea 100644
--- a/src/H5Cdbg.c
+++ b/src/H5Cdbg.c
@@ -434,7 +434,7 @@ H5C_stats(H5C_t *cache_ptr, const char *cache_name,
double average_entries_skipped_per_calls_to_msic = 0.0f;
double average_dirty_pf_entries_skipped_per_call_to_msic = 0.0f;
double average_entries_scanned_per_calls_to_msic = 0.0f;
-#endif /* H5C_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -489,7 +489,7 @@ H5C_stats(H5C_t *cache_ptr, const char *cache_name,
if (aggregate_max_pins < cache_ptr->max_pins[i])
aggregate_max_pins = cache_ptr->max_pins[i];
#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
- } /* end for */
+ } /* end for */
if ((total_hits > 0) || (total_misses > 0))
hit_rate = (double)100.0f * ((double)(total_hits)) / ((double)(total_hits + total_misses));
@@ -738,7 +738,7 @@ H5C_stats__reset(H5C_t *cache_ptr)
#else /* NDEBUG */
#if H5C_COLLECT_CACHE_STATS
H5C_stats__reset(H5C_t *cache_ptr)
-#else /* H5C_COLLECT_CACHE_STATS */
+#else /* H5C_COLLECT_CACHE_STATS */
H5C_stats__reset(H5C_t H5_ATTR_UNUSED *cache_ptr)
#endif /* H5C_COLLECT_CACHE_STATS */
#endif /* NDEBUG */
diff --git a/src/H5Cimage.c b/src/H5Cimage.c
index 3135969..b3f6c12 100644
--- a/src/H5Cimage.c
+++ b/src/H5Cimage.c
@@ -361,7 +361,7 @@ H5C__construct_cache_image_buffer(H5F_t *f, H5C_t *cache_ptr)
fake_cache_ptr->image_entries = (H5C_image_entry_t *)H5MM_xfree(fake_cache_ptr->image_entries);
fake_cache_ptr = (H5C_t *)H5MM_xfree(fake_cache_ptr);
- } /* end block */
+ } /* end block */
#endif /* NDEBUG */
done:
@@ -908,7 +908,7 @@ done:
herr_t
#if H5C_COLLECT_CACHE_STATS
H5C_image_stats(H5C_t *cache_ptr, hbool_t print_header)
-#else /* H5C_COLLECT_CACHE_STATS */
+#else /* H5C_COLLECT_CACHE_STATS */
H5C_image_stats(H5C_t *cache_ptr, hbool_t H5_ATTR_UNUSED print_header)
#endif /* H5C_COLLECT_CACHE_STATS */
{
@@ -918,7 +918,7 @@ H5C_image_stats(H5C_t *cache_ptr, hbool_t H5_ATTR_UNUSED print_header)
int64_t total_misses = 0;
double hit_rate;
double prefetch_use_rate;
-#endif /* H5C_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -1024,7 +1024,7 @@ H5C__read_cache_image(H5F_t *f, H5C_t *cache_ptr)
HMPI_GOTO_ERROR(FAIL, "can't receive cache image MPI_Bcast", mpi_result)
} /* end else-if */
} /* end block */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1607,7 +1607,7 @@ H5C_set_cache_image_config(const H5F_t *f, H5C_t *cache_ptr, H5C_cache_image_ctl
HDassert(!(cache_ptr->image_ctl.generate_image));
} /* end else */
#ifdef H5_HAVE_PARALLEL
- } /* end else */
+ } /* end else */
#endif /* H5_HAVE_PARALLEL */
done:
@@ -2088,7 +2088,7 @@ H5C__destroy_pf_entry_child_flush_deps(H5C_t *cache_ptr, H5C_cache_entry_t *pf_e
u++;
} /* end while */
HDassert(found);
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end if */
} /* end if */
@@ -3172,7 +3172,7 @@ H5C__reconstruct_cache_contents(H5F_t *f, H5C_t *cache_ptr)
* we add code to store and restore adaptive resize status.
*/
HDassert(lru_rank_holes <= H5C__MAX_EPOCH_MARKERS);
- } /* end block */
+ } /* end block */
#endif /* NDEBUG */
/* Check to see if the cache is oversize, and evict entries as
@@ -3480,7 +3480,7 @@ H5C__write_cache_image(H5F_t *f, const H5C_t *cache_ptr)
#ifdef H5_HAVE_PARALLEL
} /* end if */
} /* end block */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 081206e..60bf57e 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -2429,7 +2429,7 @@ H5D__chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr, hbool_t write_
#ifdef H5_HAVE_PARALLEL
} /* end else */
#endif /* H5_HAVE_PARALLEL */
- } /* end else */
+ } /* end else */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -4427,7 +4427,7 @@ H5D__chunk_allocate(const H5D_io_info_t *io_info, hbool_t full_overwrite, hsize_
/* Check for the chunk expanding too much to encode in a 32-bit value */
if (orig_chunk_size > ((size_t)0xffffffff))
HGOTO_ERROR(H5E_DATASET, H5E_BADRANGE, FAIL, "chunk too large for 32-bit length")
-#endif /* H5_SIZEOF_SIZE_T > 4 */
+#endif /* H5_SIZEOF_SIZE_T > 4 */
} /* end if */
} /* end if */
@@ -4629,7 +4629,7 @@ H5D__chunk_allocate(const H5D_io_info_t *io_info, hbool_t full_overwrite, hsize_
#ifdef H5_HAVE_PARALLEL
} /* end else */
#endif /* H5_HAVE_PARALLEL */
- } /* end if */
+ } /* end if */
/* Insert the chunk record into the index */
if (need_insert && ops->insert)
diff --git a/src/H5Defl.c b/src/H5Defl.c
index 77ea056..1ab677a 100644
--- a/src/H5Defl.c
+++ b/src/H5Defl.c
@@ -272,8 +272,8 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size
tempto_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
H5_CHECK_OVERFLOW(tempto_read, hsize_t, size_t);
to_read = (size_t)tempto_read;
-#else /* NDEBUG */
- to_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
+#else /* NDEBUG */
+ to_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
#endif /* NDEBUG */
if ((n = HDread(fd, buf, to_read)) < 0)
HGOTO_ERROR(H5E_EFL, H5E_READERROR, FAIL, "read error in external raw data file")
@@ -364,7 +364,7 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz
tempto_write = MIN(efl->slot[u].size - skip, (hsize_t)size);
H5_CHECK_OVERFLOW(tempto_write, hsize_t, size_t);
to_write = (size_t)tempto_write;
-#else /* NDEBUG */
+#else /* NDEBUG */
to_write = MIN((size_t)(efl->slot[u].size - skip), size);
#endif /* NDEBUG */
if ((size_t)HDwrite(fd, buf, to_write) != to_write)
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 813a7c7..3416e9f 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -2001,7 +2001,7 @@ H5D_close(H5D_t *dataset)
HDassert("not implemented yet" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */ /*lint !e788 All appropriate cases are covered */
/* Destroy any cached layout information for the dataset */
@@ -2165,7 +2165,7 @@ H5D_mult_refresh_close(hid_t dset_id)
HDassert("not implemented yet" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */ /*lint !e788 All appropriate cases are covered */
/* Destroy any cached layout information for the dataset */
@@ -2375,7 +2375,7 @@ H5D__alloc_storage(const H5D_io_info_t *io_info, H5D_time_alloc_t time_alloc, hb
HDassert("not implemented yet" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */ /*lint !e788 All appropriate cases are covered */
/* Check if we need to initialize the space */
@@ -2497,7 +2497,7 @@ H5D__init_storage(const H5D_io_info_t *io_info, hbool_t full_overwrite, hsize_t
HDassert("not implemented yet" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */ /*lint !e788 All appropriate cases are covered */
done:
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index 4bca0cb..df7c829 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -424,7 +424,7 @@ H5D__mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space, co
#ifdef H5_HAVE_INSTRUMENTED_LIBRARY
H5CX_test_set_mpio_coll_rank0_bcast(TRUE);
#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
- } /* end if */
+ } /* end if */
/* Set the return value, based on the global cause */
ret_value = global_cause[0] > 0 ? FALSE : TRUE;
@@ -843,7 +843,7 @@ H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
else
temp_not_link_io = TRUE;
#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
- } /* end else */
+ } /* end else */
#ifdef H5_HAVE_INSTRUMENTED_LIBRARY
{
diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c
index f61522f..2588d1c 100644
--- a/src/H5Dvirtual.c
+++ b/src/H5Dvirtual.c
@@ -2821,8 +2821,8 @@ H5D__virtual_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsiz
HDassert((tot_nelmts + (hsize_t)select_nelmts) >= nelmts);
} /* end block */
#endif /* NDEBUG */
- } /* end if */
- } /* end if */
+ } /* end if */
+ } /* end if */
done:
/* Cleanup I/O operation */
diff --git a/src/H5E.c b/src/H5E.c
index 7be3d34..22f47ea 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -306,14 +306,14 @@ H5E__set_default_auto(H5E_t *stk)
#ifndef H5_NO_DEPRECATED_SYMBOLS
#ifdef H5_USE_16_API_DEFAULT
stk->auto_op.vers = 1;
-#else /* H5_USE_16_API */
+#else /* H5_USE_16_API */
stk->auto_op.vers = 2;
#endif /* H5_USE_16_API_DEFAULT */
stk->auto_op.func1 = stk->auto_op.func1_default = (H5E_auto1_t)H5Eprint1;
stk->auto_op.func2 = stk->auto_op.func2_default = (H5E_auto2_t)H5Eprint2;
stk->auto_op.is_default = TRUE;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
stk->auto_op.func2 = (H5E_auto2_t)H5Eprint2;
#endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index a41c25c..6316ded 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -555,9 +555,9 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
@@ -939,10 +939,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
@@ -1346,10 +1346,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
@@ -1750,10 +1750,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
@@ -2125,10 +2125,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
diff --git a/src/H5EAtest.c b/src/H5EAtest.c
index bbd436e..0a85729 100644
--- a/src/H5EAtest.c
+++ b/src/H5EAtest.c
@@ -262,7 +262,7 @@ BEGIN_FUNC(STATIC, NOERR, herr_t, SUCCEED, -,
/* Local variables */
#ifndef NDEBUG
H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
uint64_t * elmt = (uint64_t *)_elmt; /* Convenience pointer to native elements */
const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */
diff --git a/src/H5Eint.c b/src/H5Eint.c
index 2580fa4..c743ddb 100644
--- a/src/H5Eint.c
+++ b/src/H5Eint.c
@@ -440,10 +440,10 @@ H5E__print(const H5E_t *estack, FILE *stream, hbool_t bk_compatible)
walk_op.u.func1 = H5E__walk1_cb;
if (H5E__walk(estack, H5E_WALK_DOWNWARD, &walk_op, (void *)&eprint) < 0)
HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't walk error stack")
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
HDassert(0 && "version 1 error stack print without deprecated symbols!");
#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+ } /* end if */
else {
walk_op.vers = 2;
walk_op.u.func2 = H5E__walk2_cb;
@@ -539,10 +539,10 @@ H5E__walk(const H5E_t *estack, H5E_direction_t direction, const H5E_walk_op_t *o
if (ret_value < 0)
HERROR(H5E_ERROR, H5E_CANTLIST, "can't walk error stack");
} /* end if */
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
HDassert(0 && "version 1 error stack walk without deprecated symbols!");
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ } /* end if */
else {
HDassert(op->vers == 2);
if (op->u.func2) {
@@ -939,7 +939,7 @@ H5E_dump_api_stack(hbool_t is_api)
#ifdef H5_NO_DEPRECATED_SYMBOLS
if (estack->auto_op.func2)
(void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data));
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
if (estack->auto_op.vers == 1) {
if (estack->auto_op.func1)
(void)((estack->auto_op.func1)(estack->auto_data));
@@ -949,7 +949,7 @@ H5E_dump_api_stack(hbool_t is_api)
(void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data));
} /* end else */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+ } /* end if */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Epkg.h b/src/H5Epkg.h
index fe5e127..a1db885 100644
--- a/src/H5Epkg.h
+++ b/src/H5Epkg.h
@@ -73,7 +73,7 @@ typedef struct {
H5E_auto1_t func1_default; /* The saved library's default function - old style. */
H5E_auto2_t func2_default; /* The saved library's default function - new style. */
} H5E_auto_op_t;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
typedef struct {
H5E_auto2_t func2; /* Only the new style callback function is available. */
} H5E_auto_op_t;
@@ -85,7 +85,7 @@ typedef struct {
union {
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5E_walk1_t func1; /* Old-style callback, NO error stack param. */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5E_walk2_t func2; /* New-style callback, with error stack param. */
} u;
} H5E_walk_op_t;
diff --git a/src/H5F.c b/src/H5F.c
index d9d8308..d15e4a3 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -472,7 +472,7 @@ done:
hid_t
H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
{
- void * new_file = NULL; /* File struct for new file */
+ void * new_file = NULL; /* File struct for new file */
H5P_genplist_t * plist; /* Property list pointer */
H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */
H5VL_object_t * vol_obj = NULL; /* VOL object for file */
diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index b9c2f93..3772399 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -478,9 +478,9 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
@@ -862,9 +862,9 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
@@ -1205,10 +1205,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
diff --git a/src/H5FAtest.c b/src/H5FAtest.c
index 350530a..4da7d6f 100644
--- a/src/H5FAtest.c
+++ b/src/H5FAtest.c
@@ -241,7 +241,7 @@ BEGIN_FUNC(STATIC, NOERR, herr_t, SUCCEED, -,
/* Local variables */
#ifndef NDEBUG
H5FA__test_ctx_t *ctx = (H5FA__test_ctx_t *)_ctx; /* Callback context to destroy */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
uint64_t * elmt = (uint64_t *)_elmt; /* Convenience pointer to native elements */
const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 512dc1e..61f46c7 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -88,7 +88,7 @@ typedef struct H5FD_core_t {
DWORD dwVolumeSerialNumber;
HANDLE hFile; /* Native windows file handle */
-#endif /* H5_HAVE_WIN32_API */
+#endif /* H5_HAVE_WIN32_API */
hbool_t dirty; /* changes not saved? */
H5FD_file_image_callbacks_t fi_callbacks; /* file image callbacks */
H5SL_t * dirty_list; /* dirty parts of the file */
@@ -831,11 +831,11 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
file->nFileIndexHigh = fileinfo.nFileIndexHigh;
file->nFileIndexLow = fileinfo.nFileIndexLow;
file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
file->device = sb.st_dev;
file->inode = sb.st_ino;
#endif /* H5_HAVE_WIN32_API */
- } /* end if */
+ } /* end if */
/* If an existing file is opened, load the whole file into memory. */
if (!(H5F_ACC_CREAT & flags)) {
@@ -1071,7 +1071,7 @@ H5FD__core_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(-1)
if (f1->device > f2->device)
HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -1088,7 +1088,7 @@ H5FD__core_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(1)
#endif /*H5_HAVE_WIN32_API*/
- } /* end if */
+ } /* end if */
else {
if (NULL == f1->name && NULL == f2->name) {
if (f1 < f2)
@@ -1335,7 +1335,7 @@ H5FD__core_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
temp_nbytes = file->eof - addr;
H5_CHECK_OVERFLOW(temp_nbytes, hsize_t, size_t);
nbytes = MIN(size, (size_t)temp_nbytes);
-#else /* NDEBUG */
+#else /* NDEBUG */
nbytes = MIN(size, (size_t)(file->eof - addr));
#endif /* NDEBUG */
@@ -1607,7 +1607,7 @@ H5FD__core_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing
bError = SetEndOfFile(file->hFile);
if (0 == bError)
HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
if (-1 == HDftruncate(file->fd, (HDoff_t)new_eof))
HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
#endif /* H5_HAVE_WIN32_API */
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c
index eb2590f..605ca71 100644
--- a/src/H5FDdirect.c
+++ b/src/H5FDdirect.c
@@ -660,7 +660,7 @@ H5FD__direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(-1)
if (f1->device > f2->device)
HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -1276,7 +1276,7 @@ H5FD__direct_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_AT
(void)SetFilePointer((HANDLE)filehandle, li.LowPart, &li.HighPart, FILE_BEGIN);
if (SetEndOfFile((HANDLE)filehandle) == 0)
HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
#endif /* H5_HAVE_WIN32_API */
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
index 9369955..9f0614e 100644
--- a/src/H5FDhdfs.c
+++ b/src/H5FDhdfs.c
@@ -29,13 +29,13 @@
#include "H5FDdrvr_module.h"
#endif /* H5_HAVE_LIBHDFS */
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5FDprivate.h" /* File drivers */
-#include "H5FDhdfs.h" /* hdfs file driver */
-#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5FDprivate.h" /* File drivers */
+#include "H5FDhdfs.h" /* hdfs file driver */
+#include "H5FLprivate.h" /* Free Lists */
+#include "H5Iprivate.h" /* IDs */
+#include "H5MMprivate.h" /* Memory management */
#ifdef H5_HAVE_LIBHDFS
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index 99b0b8d..fc2cb12 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -570,7 +570,7 @@ H5FD__log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
file->nFileIndexHigh = fileinfo.nFileIndexHigh;
file->nFileIndexLow = fileinfo.nFileIndexLow;
file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
file->device = sb.st_dev;
file->inode = sb.st_ino;
#endif /* H5_HAVE_WIN32_API */
@@ -861,7 +861,7 @@ H5FD__log_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(-1)
if (f1->device > f2->device)
HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -1182,7 +1182,7 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
#ifndef H5_HAVE_PREADWRITE
H5_timer_t seek_timer; /* Timer for seek operation */
H5_timevals_t seek_times; /* Elapsed time for seek operation */
-#endif /* H5_HAVE_PREADWRITE */
+#endif /* H5_HAVE_PREADWRITE */
HDoff_t offset = (HDoff_t)addr;
herr_t ret_value = SUCCEED; /* Return value */
@@ -1250,7 +1250,7 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
HDfprintf(file->logfp, "\n");
} /* end if */
} /* end if */
-#endif /* H5_HAVE_PREADWRITE */
+#endif /* H5_HAVE_PREADWRITE */
/* Start timer for read operation */
if (file->fa.flags & H5FD_LOG_TIME_READ) {
@@ -1280,7 +1280,7 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
if (bytes_read > 0)
offset += bytes_read;
#else
- bytes_read = HDread(file->fd, buf, bytes_in);
+ bytes_read = HDread(file->fd, buf, bytes_in);
#endif /* H5_HAVE_PREADWRITE */
} while (-1 == bytes_read && EINTR == errno);
@@ -1396,7 +1396,7 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha
#ifndef H5_HAVE_PREADWRITE
H5_timer_t seek_timer; /* Timer for seek operation */
H5_timevals_t seek_times; /* Elapsed time for seek operation */
-#endif /* H5_HAVE_PREADWRITE */
+#endif /* H5_HAVE_PREADWRITE */
HDoff_t offset = (HDoff_t)addr;
herr_t ret_value = SUCCEED; /* Return value */
@@ -1472,7 +1472,7 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha
HDfprintf(file->logfp, "\n");
} /* end if */
} /* end if */
-#endif /* H5_HAVE_PREADWRITE */
+#endif /* H5_HAVE_PREADWRITE */
/* Start timer for write operation */
if (file->fa.flags & H5FD_LOG_TIME_WRITE) {
@@ -1648,7 +1648,7 @@ H5FD__log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_
if (0 == SetEndOfFile(file->hFile))
HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
}
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
/* Truncate/extend the file */
if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
diff --git a/src/H5FDmirror.c b/src/H5FDmirror.c
index c79ce85..17d03d2 100644
--- a/src/H5FDmirror.c
+++ b/src/H5FDmirror.c
@@ -126,7 +126,7 @@ typedef struct H5FD_mirror_t {
} while (0)
#else
#define LOG_XMIT_BYTES(label, buf, len) /* no-op */
-#endif /* MIRROR_DEBUG_XMIT_BYTE */
+#endif /* MIRROR_DEBUG_XMIT_BYTE */
#if MIRROR_DEBUG_OP_CALLS
#define LOG_OP_CALL(name) \
@@ -136,7 +136,7 @@ typedef struct H5FD_mirror_t {
} while (0)
#else
#define LOG_OP_CALL(name) /* no-op */
-#endif /* MIRROR_DEBUG_OP_CALLS */
+#endif /* MIRROR_DEBUG_OP_CALLS */
/* Prototypes */
static herr_t H5FD__mirror_term(void);
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index a4e0baf..c16e01e 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -200,7 +200,7 @@ H5FD_mpio_init(void)
{
#ifdef H5FDmpio_DEBUG
static int H5FD_mpio_Debug_inited = 0;
-#endif /* H5FDmpio_DEBUG */
+#endif /* H5FDmpio_DEBUG */
const char *s; /* String for environment variables */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
@@ -229,7 +229,7 @@ H5FD_mpio_init(void)
} /* end while */
} /* end if */
H5FD_mpio_Debug_inited++;
- } /* end if */
+ } /* end if */
#endif /* H5FDmpio_DEBUG */
/* Set return value */
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 02323c6..7789d39 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -377,7 +377,7 @@ H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
file->nFileIndexHigh = fileinfo.nFileIndexHigh;
file->nFileIndexLow = fileinfo.nFileIndexLow;
file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
file->device = sb.st_dev;
file->inode = sb.st_ino;
#endif /* H5_HAVE_WIN32_API */
@@ -507,7 +507,7 @@ H5FD__sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(-1)
if (f1->device > f2->device)
HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -742,7 +742,7 @@ H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
if (bytes_read > 0)
offset += bytes_read;
#else
- bytes_read = HDread(file->fd, buf, bytes_in);
+ bytes_read = HDread(file->fd, buf, bytes_in);
#endif /* H5_HAVE_PREADWRITE */
} while (-1 == bytes_read && EINTR == errno);
@@ -945,7 +945,7 @@ H5FD__sec2_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
bError = SetEndOfFile(file->hFile);
if (0 == bError)
HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
#endif /* H5_HAVE_WIN32_API */
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index 98210a4..38a96fb 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -333,7 +333,7 @@ H5FD__free_real(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size)
HDfprintf(stderr, "%s: LEAKED MEMORY!!! type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type,
addr, size);
#endif /* H5FD_ALLOC_DEBUG */
- } /* end else */
+ } /* end else */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5FDsplitter.c b/src/H5FDsplitter.c
index 4d6554c..189c054 100644
--- a/src/H5FDsplitter.c
+++ b/src/H5FDsplitter.c
@@ -94,7 +94,7 @@ typedef struct H5FD_splitter_t {
} while (0)
#else
#define H5FD_SPLITTER_LOG_CALL(name) /* no-op */
-#endif /* H5FD_SPLITTER_DEBUG_OP_CALLS */
+#endif /* H5FD_SPLITTER_DEBUG_OP_CALLS */
/* Private functions */
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index c66765a..4650c39 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -115,7 +115,7 @@ typedef struct H5FD_stdio_t {
DWORD nFileIndexHigh;
DWORD dwVolumeSerialNumber;
- HANDLE hFile; /* Native windows file handle */
+ HANDLE hFile; /* Native windows file handle */
#endif /* H5_HAVE_WIN32_API */
} H5FD_stdio_t;
@@ -338,7 +338,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
static const char *func = "H5FD_stdio_open"; /* Function Name for error reporting */
#ifdef H5_HAVE_WIN32_API
struct _BY_HANDLE_FILE_INFORMATION fileinfo;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
struct stat sb;
#endif /* H5_HAVE_WIN32_API */
@@ -431,7 +431,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
/* Get the file descriptor (needed for truncate and some Windows information) */
#ifdef H5_HAVE_WIN32_API
file->fd = _fileno(file->fp);
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
file->fd = fileno(file->fp);
#endif /* H5_HAVE_WIN32_API */
if (file->fd < 0) {
@@ -458,7 +458,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
file->nFileIndexHigh = fileinfo.nFileIndexHigh;
file->nFileIndexLow = fileinfo.nFileIndexLow;
file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
if (fstat(file->fd, &sb) < 0) {
free(file);
fclose(f);
@@ -549,7 +549,7 @@ H5FD_stdio_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
return -1;
if (f1->device > f2->device)
return 1;
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -1075,7 +1075,7 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, hbool_t /*UNUSED*/
if (0 == bError)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR,
"unable to truncate/extend file properly", -1)
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
/* Reset seek offset to beginning of file, so that file isn't re-extended later */
rewind(file->fp);
diff --git a/src/H5FS.c b/src/H5FS.c
index d75711c..4a050a6 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -362,7 +362,7 @@ H5FS_delete(H5F_t *f, haddr_t fs_addr)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Done expunging free space section info from cache\n", FUNC);
-#endif /* H5FS_DEBUG */
+#endif /* H5FS_DEBUG */
} /* end if */
else {
#ifdef H5FS_DEBUG
@@ -513,7 +513,7 @@ H5FS_close(H5F_t *f, H5FS_t *fspace)
*/
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Section info can't 'go away', header will own it\n", FUNC);
-#endif /* H5FS_DEBUG */
+#endif /* H5FS_DEBUG */
} /* end if */
else {
#ifdef H5FS_DEBUG
diff --git a/src/H5FScache.c b/src/H5FScache.c
index fc61edd..bf91e22 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -820,10 +820,10 @@ H5FS__cache_hdr_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_FSPACE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1004,7 +1004,8 @@ H5FS__cache_sinfo_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED l
/* Check for any serialized sections */
if (fspace->serial_sect_count > 0) {
hsize_t old_tot_sect_count; /* Total section count from header */
- hsize_t H5_ATTR_NDEBUG_UNUSED old_serial_sect_count; /* Total serializable section count from header */
+ hsize_t H5_ATTR_NDEBUG_UNUSED
+ old_serial_sect_count; /* Total serializable section count from header */
hsize_t H5_ATTR_NDEBUG_UNUSED old_ghost_sect_count; /* Total ghost section count from header */
hsize_t H5_ATTR_NDEBUG_UNUSED old_tot_space; /* Total space managed from header */
unsigned sect_cnt_size; /* The size of the section size counts */
@@ -1357,9 +1358,9 @@ H5FS__cache_sinfo_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_FSPACE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
diff --git a/src/H5Fint.c b/src/H5Fint.c
index f7ec1c2..1d7a86f 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -2624,7 +2624,7 @@ H5F__build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl, const char *n
#ifdef H5_HAVE_SYMLINK
/* This has to be declared here to avoid unfreed resources on errors */
char *realname = NULL; /* Fully resolved path name of file */
-#endif /* H5_HAVE_SYMLINK */
+#endif /* H5_HAVE_SYMLINK */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index f4268e5..6219433 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -31,7 +31,7 @@ typedef struct H5F_t H5F_t;
#include "H5MMprivate.h" /* Memory management */
#ifdef H5_HAVE_PARALLEL
#include "H5Pprivate.h" /* Property lists */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
#include "H5VMprivate.h" /* Vectors and arrays */
#include "H5VLprivate.h" /* Virtual Object Layer */
@@ -590,10 +590,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 \
@@ -618,7 +618,7 @@ typedef struct H5F_t H5F_t;
#ifdef H5_HAVE_PARALLEL
#define H5F_ACS_MPI_PARAMS_COMM_NAME "mpi_params_comm" /* the MPI communicator */
#define H5F_ACS_MPI_PARAMS_INFO_NAME "mpi_params_info" /* the MPI info struct */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* ======================== File Mount properties ====================*/
#define H5F_MNT_SYM_LOCAL_NAME "local" /* Whether absolute symlinks local to file. */
@@ -648,14 +648,15 @@ typedef struct H5F_t H5F_t;
/* B-tree internal 'K' values */
#define HDF5_BTREE_SNODE_IK_DEF 16
-#define HDF5_BTREE_CHUNK_IK_DEF 32 /* Note! this value is assumed \
- to be 32 for version 0 \
- of the superblock and \
- if it is changed, the code \
- must compensate. -QAK \
- */
+#define HDF5_BTREE_CHUNK_IK_DEF \
+ 32 /* Note! this value is assumed \
+ to be 32 for version 0 \
+ of the superblock and \
+ if it is changed, the code \
+ 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/H5Fpublic.h b/src/H5Fpublic.h
index 04a72ba..858bbd5 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -84,8 +84,9 @@
#define H5F_OBJ_DATATYPE (0x0008u) /**< Named datatype objects */
#define H5F_OBJ_ATTR (0x0010u) /**< Attribute objects */
#define H5F_OBJ_ALL (H5F_OBJ_FILE | H5F_OBJ_DATASET | H5F_OBJ_GROUP | H5F_OBJ_DATATYPE | H5F_OBJ_ATTR)
-#define H5F_OBJ_LOCAL (0x0020u) /**< Restrict search to objects opened through current file ID
- (as opposed to objects opened through any file ID accessing this file) */
+#define H5F_OBJ_LOCAL \
+ (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
@@ -987,8 +988,9 @@ H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
* </tr>
* <tr>
* <td><em>hbool_t</em> <code>open_trace_file</code> </td>
- * <td>OUT: Boolean field indicating whether the <code>trace_file_name</code> field should be used to open
- * a trace file for the cache. This field will always be set to <code>0</code> in this context.</td>
+ * <td>OUT: Boolean field indicating whether the <code>trace_file_name</code> field should be used to
+ * open a trace file for the cache. This field will always be set to <code>0</code> in this
+ * context.</td>
* </tr>
* <tr>
* <td><em>hbool_t</em> <code>close_trace_file</code> </td>
@@ -996,8 +998,8 @@ H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
* will always be set to <code>0</code> in this context.</td></tr>
* <tr>
* <td><em>char*</em><code>trace_file_name</code> </td>
- * <td>OUT: Full path name of the trace file to be opened if the <code>open_trace_file</code> field is set
- * to <code>1</code>. This field will always be set to the empty string in this context.</td></tr>
+ * <td>OUT: Full path name of the trace file to be opened if the <code>open_trace_file</code> field is
+ * set to <code>1</code>. This field will always be set to the empty string in this context.</td></tr>
* <tr>
* <td><em>hbool_t</em> <code>evictions_enabled</code> </td>
* <td>OUT: Boolean flag indicating whether metadata cache entry evictions are
@@ -1041,10 +1043,10 @@ H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
* <table>
* <tr>
* <td><em>enum H5C_cache_incr_mode</em> <code>incr_mode</code> </td>
- * <td>OUT: Enumerated value indicating the operational mode of the automatic cache size increase code. At
- * present, only the following values are legal:<p>\c H5C_incr__off: Automatic cache size increase is
- * disabled.</p><p>\c H5C_incr__threshold: Automatic cache size increase is enabled using the hit rate
- * threshold algorithm.</p></td>
+ * <td>OUT: Enumerated value indicating the operational mode of the automatic cache size increase code.
+ * At present, only the following values are legal:<p>\c H5C_incr__off: Automatic cache size increase
+ * is disabled.</p><p>\c H5C_incr__threshold: Automatic cache size increase is enabled using the hit
+ * rate threshold algorithm.</p></td>
* </tr>
* <tr>
* <td><em>double</em> <code>lower_hr_threshold</code> </td>
@@ -1070,8 +1072,8 @@ H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
* <td><em>enum H5C_cache_flash_incr_mode</em> <code>flash_incr_mode</code> </td>
* <td>OUT: Enumerated value indicating the operational mode of the flash cache size increase code. At
* present, only the following values are legal:<p>\c H5C_flash_incr__off: Flash cache size increase is
- * disabled.</p><p>\c H5C_flash_incr__add_space: Flash cache size increase is enabled using the add space
- * algorithm.</p></td>
+ * disabled.</p><p>\c H5C_flash_incr__add_space: Flash cache size increase is enabled using the add
+ * space algorithm.</p></td>
* </tr>
* <tr>
* <td><em>double</em> <code>flash_threshold</code> </td>
@@ -1082,8 +1084,8 @@ H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
* <tr>
* <td><em>double</em> <code>flash_multiple</code> </td>
* <td>OUT: The factor by which the size of the triggering entry / entry size increase is multiplied to
- * obtain the initial cache size increment. This increment may be reduced to reflect existing free space
- * in the cache and the <code>max_size</code> field above.</td>
+ * obtain the initial cache size increment. This increment may be reduced to reflect existing free
+ * space in the cache and the <code>max_size</code> field above.</td>
* </tr>
* </table>
*
@@ -1094,13 +1096,13 @@ H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
* </tr>
* <tr>
* <td><em>enum H5C_cache_decr_mode</em> <code>decr_mode</code> </td>
- * <td>OUT: Enumerated value indicating the operational mode of the automatic cache size decrease code. At
- * present, the following values are legal:<p>H5C_decr__off: Automatic cache size decrease is disabled,
- * and the remaining decrement fields are ignored.</p><p>H5C_decr__threshold: Automatic cache size
- * decrease is enabled using the hit rate threshold algorithm.</p><p>H5C_decr__age_out: Automatic cache
- * size decrease is enabled using the ageout algorithm.</p><p>H5C_decr__age_out_with_threshold:
- * Automatic cache size decrease is enabled using the ageout with hit rate threshold
- * algorithm</p></td>
+ * <td>OUT: Enumerated value indicating the operational mode of the automatic cache size decrease code.
+ * At present, the following values are legal:<p>H5C_decr__off: Automatic cache size decrease is
+ * disabled, and the remaining decrement fields are ignored.</p><p>H5C_decr__threshold: Automatic
+ * cache size decrease is enabled using the hit rate threshold algorithm.</p><p>H5C_decr__age_out:
+ * Automatic cache size decrease is enabled using the ageout algorithm.</p>
+ * <p>H5C_decr__age_out_with_threshold: Automatic cache size decrease is enabled using the ageout
+ * with hit rate threshold algorithm</p></td>
* </tr>
* <tr><td><em>double</em> <code>upper_hr_threshold</code> </td>
* <td>OUT: Upper hit rate threshold. This value is only used if the decr_mode is either
@@ -1143,7 +1145,8 @@ H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
* <tr><td><em>int</em> <code>dirty_bytes_threshold</code> </td>
* <td>OUT: Threshold number of bytes of dirty metadata generation for triggering synchronizations of the
* metadata caches serving the target file in the parallel case.<p>Synchronization occurs whenever the
- * number of bytes of dirty metadata created since the last synchronization exceeds this limit.</p></td>
+ * number of bytes of dirty metadata created since the last synchronization exceeds this
+ * limit.</p></td>
* </tr>
* </table>
*
@@ -1179,59 +1182,59 @@ H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
* <tr>
* <td><em>hbool_t</em> <code>rpt_fcn_enabled</code></td>
* <td>IN: Boolean flag indicating whether the adaptive cache resize report function is enabled. This
- * field should almost always be set to disabled (<code>0</code>). Since resize algorithm activity is reported
- * via stdout, it MUST be set to disabled (<code>0</code>) on Windows machines.<p>The report function is not
- * supported code, and can be expected to change between versions of the library. Use it at your own
- * risk.</p></td>
+ * field should almost always be set to disabled (<code>0</code>). Since resize algorithm activity is
+ * reported via stdout, it MUST be set to disabled (<code>0</code>) on Windows machines.<p>The report
+ * function is not supported code, and can be expected to change between versions of the library. Use
+ * it at your own risk.</p></td>
* </tr>
* <tr>
* <td><em>hbool_t</em> <code>open_trace_File</code></td>
* <td>IN: Boolean field indicating whether the <code>trace_file_name</code> field should be used to open
- * a trace file for the cache.<p>The trace file is a debuging feature that allows the capture of top level
- * metadata cache requests for purposes of debugging and/or optimization. This field should normally be set
- * to <code>0</code>, as trace file collection imposes considerable overhead.</p><p>This field should only be
- * set to <code>1</code> when the <code>trace_file_name</code> contains the full path of the desired trace
- * file, and either there is no open trace file on the cache, or the <code>close_trace_file</code> field is
- * also <code>1</code>.</p><p>The trace file feature is unsupported unless used at the direction of The HDF
- * Group. It is intended to allow The HDF Group to collect a trace of cache activity in cases of occult
- * failures and/or poor performance seen in the field, so as to aid in reproduction in the lab. If you use it
- * absent the direction of The HDF Group, you are on your
- * own.</p></td>
+ * a trace file for the cache.<p>The trace file is a debuging feature that allows the capture of top
+ * level metadata cache requests for purposes of debugging and/or optimization. This field should
+ * <p>This field should only normally be set to <code>0</code>, as trace file collection imposes
+ * considerable overhead.</p> be set to <code>1</code> when the <code>trace_file_name</code> contains
+ * the full path of the desired trace file, and either there is no open trace file on the cache, or the
+ * <code>close_trace_file</code> field is also <code>1</code>.</p><p>The trace file feature is
+ * unsupported unless used at the direction of The HDF Group. It is intended to allow The HDF Group to
+ * collect a trace of cache activity in cases of occult failures and/or poor performance seen in the
+ * field, so as to aid in reproduction in the lab. If you use it absent the direction of The HDF Group,
+ * you are on your own.</p></td>
* </tr>
* <tr><td><em>hbool_t</em> <code>close_trace_file</code></td>
* <td>IN: Boolean field indicating whether the current trace file (if any) should be closed.<p>See the
- * above comments on the <code>open_trace_file</code> field. This field should be set to <code>0</code> unless
- * there is an open trace file on the cache that you wish to close.</p><p>The trace file feature is
- * unsupported unless used at the direction of The HDF Group. It is intended to allow The HDF Group to collect
- * a trace of cache activity in cases of occult failures and/or poor performance seen in the field, so as to
- * aid in reproduction in the lab. If you use it absent the direction of The HDF Group, you are on your
- * own.</p></td>
+ * above comments on the <code>open_trace_file</code> field. This field should be set to
+ * <code>0</code> unless there is an open trace file on the cache that you wish to close.</p><p>The
+ * trace file feature is unsupported unless used at the direction of The HDF Group. It is intended to
+ * allow The HDF Group to collect a trace of cache activity in cases of occult failures and/or poor
+ * performance seen in the field, so as to aid in reproduction in the lab. If you use it absent the
+ * direction of The HDF Group, you are on your own.</p></td>
* </tr>
* <tr>
* <td><em>char</em> <code>trace_file_name[]</code></td>
* <td>IN: Full path of the trace file to be opened if the <code>open_trace_file</code> field is set
- * to <code>1</code>.<p>In the parallel case, an ascii representation of the mpi rank of the process will be
- * appended to the file name to yield a unique trace file name for each process.</p><p>The length of the path
- * must not exceed #H5AC__MAX_TRACE_FILE_NAME_LEN characters.</p><p>The trace file feature is
- * unsupported unless used at the direction of The HDF Group. It is intended to allow The HDF Group to collect
- * a trace of cache activity in cases of occult failures and/or poor performance seen in the field, so as to
- * aid in reproduction in the lab. If you use it absent the direction of The HDF Group, you are on your
- * own.</p></td>
+ * to <code>1</code>.<p>In the parallel case, an ascii representation of the mpi rank of the process
+ * will be appended to the file name to yield a unique trace file name for each process.</p><p>The
+ * length of the path must not exceed #H5AC__MAX_TRACE_FILE_NAME_LEN characters.</p><p>The trace file
+ * feature is unsupported unless used at the direction of The HDF Group. It is intended to allow The
+ * HDF Group to collect a trace of cache activity in cases of occult failures and/or poor performance
+ * seen in the field, so as to aid in reproduction in the lab. If you use it absent the direction of
+ * The HDF Group, you are on your own.</p></td>
* </tr>
* <tr>
* <td><em>hbool_t</em> <code>evictions_enabled</code></td>
* <td>IN: A boolean flag indicating whether evictions from the metadata cache are enabled. This flag is
- * initially set to enabled (<code>1</code>).<p>In rare circumstances, the raw data throughput requirements
- * may be so high that the user wishes to postpone metadata writes so as to reserve I/O throughput for raw
- * data. The <code>evictions_enabled</code> field exists to allow this. However, this is an extreme step, and
- * you have no business doing it unless you have read the User Guide section on metadata caching, and have
- * considered all other options carefully.</p><p>The <code>evictions_enabled</code> field may not be set to
- * disabled (<code>0</code>) unless all adaptive cache resizing code is disabled via
- * the <code>incr_mode</code>, <code>flash_incr_mode</code>, and <code>decr_mode</code> fields.</p><p>When
- * this flag is set to disabled (<code>0</code>), the metadata cache will not attempt to evict entries to make
- * space for new entries, and thus will grow without bound.</p><p>Evictions will be re-enabled when this field
- * is set back to <code>1</code>. This should be done as soon as
- * possible.</p></td>
+ * initially set to enabled (<code>1</code>).<p>In rare circumstances, the raw data throughput
+ * requirements may be so high that the user wishes to postpone metadata writes so as to reserve I/O
+ * throughput for raw data. The <code>evictions_enabled</code> field exists to allow this. However,
+ * this is an extreme step, and you have no business doing it unless you have read the User Guide
+ * section on metadata caching, and have considered all other options carefully.</p><p>The
+ * <code>evictions_enabled</code> field may not be set to disabled (<code>0</code>) unless all adaptive
+ * cache resizing code is disabled via the <code>incr_mode</code>, <code>flash_incr_mode</code>, and
+ * <code>decr_mode</code> fields.</p><p>When this flag is set to disabled (<code>0</code>), the
+ * metadata cache will not attempt to evict entries to make space for new entries, and thus will grow
+ * without bound.</p><p>Evictions will be re-enabled when this field is set back to <code>1</code>.
+ * This should be done as soon as possible.</p></td>
* </tr>
* <tr>
* <td><em>hbool_t</em> <code>set_initial_size</code></td>
@@ -1241,24 +1244,24 @@ H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
* <tr>
* <td><em>size_t</em> <code>initial_size</code></td>
* <td>IN: If <code>set_initial_size</code> is set to <code>1</code>, then <code>initial_size</code> must
- * contain the desired initial size in bytes. This value must lie in the closed interval <code>[min_size,
- * max_size]</code>. (see below)</td>
+ * contain the desired initial size in bytes. This value must lie in the closed interval
+ * <code>[min_size, max_size]</code>. (see below)</td>
* </tr>
* <tr><td><em>double</em> <code>min_clean_fraction</code></td>
* <td>IN: This field specifies the minimum fraction of the cache that must be kept either clean or
- * empty.<p>The value must lie in the interval [0.0, 1.0]. 0.01 is a good place to start in the serial case.
- * In the parallel case, a larger value is needed --
- * see <a href="/display/HDF5/Metadata+Caching+in+HDF5">Metadata Caching in HDF5</a> in the collection
- * "Advanced Topics in HDF5."</p></td>
+ * empty.<p>The value must lie in the interval [0.0, 1.0]. 0.01 is a good place to start in the serial
+ * case. In the parallel case, a larger value is needed -- see <a
+ * href="/display/HDF5/Metadata+Caching+in+HDF5">Metadata Caching in HDF5</a> in the collection
+ * "Advanced Topics in HDF5."</p></td>
* </tr>
* <tr><td><em>size_t</em> <code>max_size</code></td>
- * <td>IN: Upper bound (in bytes) on the range of values that the adaptive cache resize code can select as
- * the maximum cache size.</td>
+ * <td>IN: Upper bound (in bytes) on the range of values that the adaptive cache resize code can select
+ * as the maximum cache size.</td>
* </tr>
* <tr>
* <td><em>size_t</em> <code>min_size</code></td>
- * <td>IN: Lower bound (in bytes) on the range of values that the adaptive cache resize code can select as
- * the maximum cache size.</td>
+ * <td>IN: Lower bound (in bytes) on the range of values that the adaptive cache resize code can select
+ * as the maximum cache size.</td>
* </tr>
* <tr><td><em>long int</em> <code>epoch_length</code></td>
* <td>IN: Number of cache accesses between runs of the adaptive cache resize code. 50,000 is a good
@@ -1271,27 +1274,25 @@ H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
* <tr>
* <td><em>enum H5C_cache_incr_mode</em> <code>incr_mode</code></td>
* <td>IN: Enumerated value indicating the operational mode of the automatic cache size increase code. At
- * present, only two values are legal:<p>\c H5C_incr__off: Automatic cache size increase is disabled, and the
- * remaining increment fields are ignored.</p><p>\c H5C_incr__threshold: Automatic cache size increase is enabled
- * using the hit rate threshold
- * algorithm.</p></td>
+ * present, only two values are legal:<p>\c H5C_incr__off: Automatic cache size increase is disabled,
+ * and the remaining increment fields are ignored.</p><p>\c H5C_incr__threshold: Automatic cache size
+ * increase is enabled using the hit rate threshold algorithm.</p></td>
* </tr>
* <tr>
* <td><em>double</em> <code>lower_hr_threshold</code></td>
* <td>IN: Hit rate threshold used by the hit rate threshold cache size increment algorithm.<p>When the
- * hit rate over an epoch is below this threshold and the cache is full, the maximum size of the cache is
- * multiplied by increment (below), and then clipped as necessary to stay within max_size, and possibly
- * max_increment.</p><p>This field must lie in the interval [0.0, 1.0]. 0.8 or 0.9 is a good starting
- * point.</p></td>
+ * hit rate over an epoch is below this threshold and the cache is full, the maximum size of the
+ * cache is multiplied by increment (below), and then clipped as necessary to stay within max_size, and
+ * possibly max_increment.</p><p>This field must lie in the interval [0.0, 1.0]. 0.8 or 0.9 is a good
+ * starting point.</p></td>
* </tr>
* <tr>
* <td><em>double</em> <code>increment</code></td>
* <td>IN: Factor by which the hit rate threshold cache size increment algorithm multiplies the current
- * maximum cache size to obtain a tentative new cache size.<p>The actual cache size increase will be clipped
- * to satisfy the max_size specified in the general configuration, and possibly max_increment below.</p><p>The
- * parameter must be greater than or equal to 1.0 -- 2.0 is a reasonable value.</p><p>If you set it to 1.0,
- * you will effectively disable cache size
- * increases.</p></td>
+ * maximum cache size to obtain a tentative new cache size.<p>The actual cache size increase will be
+ * clipped to satisfy the max_size specified in the general configuration, and possibly max_increment
+ * below.</p><p>The parameter must be greater than or equal to 1.0 -- 2.0 is a reasonable
+ * value.</p><p>If you set it to 1.0, you will effectively disable cache size increases.</p></td>
* </tr>
* <tr>
* <td><em>hbool_t</em> <code>apply_max_increment</code></td>
@@ -1307,21 +1308,21 @@ H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
* <td><em>enum H5C_cache_flash_incr_mode</em> <code>flash_incr_mode</code></td>
* <td>IN: Enumerated value indicating the operational mode of the flash cache size increase code. At
* present, only the following values are legal:<p>\c H5C_flash_incr__off: Flash cache size increase is
- * disabled.</p><p>\c H5C_flash_incr__add_space: Flash cache size increase is enabled using the add space
- * algorithm.</p></td>
+ * disabled.</p><p>\c H5C_flash_incr__add_space: Flash cache size increase is enabled using the add
+ * space algorithm.</p></td>
* </tr>
* <tr>
* <td><em>double</em> <code>flash_threshold</code></td>
* <td>IN: The factor by which the current maximum cache size is multiplied to obtain the minimum size
- * entry / entry size increase which may trigger a flash cache size increase.<p>At present, this value must
- * lie in the range [0.1, 1.0].</p></td>
+ * entry / entry size increase which may trigger a flash cache size increase.<p>At present, this value
+ * must lie in the range [0.1, 1.0].</p></td>
* </tr>
* <tr>
* <td><em>double</em> <code>flash_multiple</code></td>
* <td>IN: The factor by which the size of the triggering entry / entry size increase is multiplied to
- * obtain the initial cache size increment. This increment may be reduced to reflect existing free space in
- * the cache and the <code>max_size</code> field above.<p>At present, this field must lie in the range [0.1,
- * 10.0].</p></td>
+ * obtain the initial cache size increment. This increment may be reduced to reflect existing free
+ * space in the cache and the <code>max_size</code> field above.<p>At present, this field must lie in
+ * the range [0.1, 10.0].</p></td>
* </tr>
* </table>
*
@@ -1331,31 +1332,30 @@ H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
* <td><em>enum H5C_cache_decr_mode</em> <code>decr_mode</code></td>
* <td>IN: Enumerated value indicating the operational mode of the automatic cache size decrease code. At
* present, the following values are legal:<p>\c H5C_decr__off: Automatic cache size decrease is
- * disabled.</p><p>\c H5C_decr__threshold: Automatic cache size decrease is enabled using the hit rate threshold
- * algorithm.</p><p>\c H5C_decr__age_out: Automatic cache size decrease is enabled using the ageout
- * algorithm.</p><p>\c H5C_decr__age_out_with_threshold: Automatic cache size decrease is enabled using the
- * ageout with hit rate threshold
- * algorithm</p></td>
+ * disabled.</p><p>\c H5C_decr__threshold: Automatic cache size decrease is enabled using the hit
+ * rate threshold algorithm.</p><p>\c H5C_decr__age_out: Automatic cache size decrease is enabled using
+ * the ageout algorithm.</p><p>\c H5C_decr__age_out_with_threshold: Automatic cache size decrease is
+ * enabled using the ageout with hit rate threshold algorithm</p></td>
* </tr>
* <tr>
* <td><em>double</em> <code>upper_hr_threshold</code></td>
* <td>IN: Hit rate threshold for the hit rate threshold and ageout with hit rate threshold cache size
- * decrement algorithms.<p>When \c decr_mode is \c H5C_decr__threshold, and the hit rate over a given epoch exceeds
- * the supplied threshold, the current maximum cache size is multiplied by decrement to obtain a tentative new
- * (and smaller) maximum cache size.</p><p>When \c decr_mode is \c H5C_decr__age_out_with_threshold, there is no
- * attempt to find and evict aged out entries unless the hit rate in the previous epoch exceeded the supplied
- * threshold.</p><p>This field must lie in the interval [0.0, 1.0].</p><p>For \c H5C_incr__threshold, .9995 or
- * .99995 is a good place to start.</p><p>For \c H5C_decr__age_out_with_threshold, .999 might be more
- * useful.</p></td>
+ * decrement algorithms.<p>When \c decr_mode is \c H5C_decr__threshold, and the hit rate over a given
+ * epoch exceeds the supplied threshold, the current maximum cache size is multiplied by decrement to
+ * obtain a tentative new (and smaller) maximum cache size.</p><p>When \c decr_mode is \c
+ * H5C_decr__age_out_with_threshold, there is no attempt to find and evict aged out entries unless the
+ * hit rate in the previous epoch exceeded the supplied threshold.</p><p>This field must lie in the
+ * interval [0.0, 1.0].</p><p>For \c H5C_incr__threshold, .9995 or .99995 is a good place to
+ * start.</p><p>For \c H5C_decr__age_out_with_threshold, .999 might be more useful.</p></td>
* </tr>
* <tr>
* <td><em>double</em> <code>decrement</code></td>
* <td>IN: In the hit rate threshold cache size decrease algorithm, this parameter contains the factor by
- * which the current max cache size is multiplied to produce a tentative new cache size.<p>The actual cache
- * size decrease will be clipped to satisfy the min_size specified in the general configuration, and possibly
- * max_decrement below.</p><p>The parameter must be be in the interval [0.0, 1.0].</p><p>If you set it to 1.0,
- * you will effectively disable cache size decreases. 0.9 is a reasonable starting
- * point.</p></td>
+ * which the current max cache size is multiplied to produce a tentative new cache size.<p>The actual
+ * cache size decrease will be clipped to satisfy the min_size specified in the general configuration,
+ * and possibly max_decrement below.</p><p>The parameter must be be in the interval
+ * [0.0, 1.0].</p><p>If you set it to 1.0, you will effectively disable cache size decreases. 0.9 is a
+ * reasonable starting point.</p></td>
* </tr>
* <tr>
* <td><em>hbool_t</em> <code>apply_max_decrement</code></td>
@@ -1370,8 +1370,8 @@ H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
* <tr>
* <td><em>int</em> <code>epochs_before_eviction</code></td>
* <td>IN: In the ageout based cache size reduction algorithms, this field contains the minimum number of
- * epochs an entry must remain unaccessed in cache before the cache size reduction algorithm tries to evict
- * it. 3 is a reasonable value.</td>
+ * epochs an entry must remain unaccessed in cache before the cache size reduction algorithm tries to
+ * evict it. 3 is a reasonable value.</td>
* </tr>
* <tr>
* <td><em>hbool_t</em> <code>apply_empty_reserve</code></td>
@@ -1380,10 +1380,10 @@ H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
* </tr>
* <tr>
* <td><em>double</em> <code>empty_reserve</code></td>
- * <td>IN: Empty reserve as a fraction of maximum cache size if applicable.<p>When so directed, the ageout
- * based algorithms will not decrease the maximum cache size unless the empty reserve can be met.</p><p>The
- * parameter must lie in the interval [0.0, 1.0]. 0.1 or 0.05 is a good place to
- * start.</p></td>
+ * <td>IN: Empty reserve as a fraction of maximum cache size if applicable.<p>When so directed, the
+ * ageout based algorithms will not decrease the maximum cache size unless the empty reserve can be
+ * met.</p><p>The parameter must lie in the interval [0.0, 1.0]. 0.1 or 0.05 is a good place to
+ * start.</p></td>
* </tr>
* </table>
*
@@ -1392,12 +1392,12 @@ H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
* <tr>
* <td><em>int</em> <code>dirty_bytes_threshold</code></td>
* <td>IN: Threshold number of bytes of dirty metadata generation for triggering synchronizations of the
- * metadata caches serving the target file in the parallel case.<p>Synchronization occurs whenever the number
- * of bytes of dirty metadata created since the last synchronization exceeds this limit.</p><p>This field only
- * applies to the parallel case. While it is ignored elsewhere, it can still draw a value out of bounds
- * error.</p><p>It must be consistant across all caches on any given file.</p><p>By default, this field is set
- * to 256 KB. It shouldn't be more than half the current maximum cache size times the minimum clean
- * fraction.</p></td>
+ * metadata caches serving the target file in the parallel case.<p>Synchronization occurs whenever the
+ * number of bytes of dirty metadata created since the last synchronization exceeds this
+ * limit.</p><p>This field only applies to the parallel case. While it is ignored elsewhere, it can
+ * still draw a value out of bounds error.</p><p>It must be consistant across all caches on any given
+ * file.</p><p>By default, this field is set to 256 KB. It shouldn't be more than half the current
+ * maximum cache size times the minimum clean fraction.</p></td>
* </tr>
* </table>
*
@@ -1639,7 +1639,8 @@ H5_DLL herr_t H5Fget_info2(hid_t obj_id, H5F_info2_t *file_info);
* <tr><td>18</td><td>Fixed array data block</td></tr>
* <tr><td>19</td><td>Fixed array data block page</td></tr>
* <tr><td>20</td><td>File's superblock (version 2)</td></tr>
- * <tr><td colspan=2><sup>*</sup> All entries are of version 0 (zero) unless indicated otherwise.</td></tr>
+ * <tr><td colspan=2><sup>*</sup> All entries are of version 0 (zero) unless indicated
+ * otherwise.</td></tr>
* </table>
*
* \note On a system that is not atomic, the library might possibly read inconsistent
@@ -1926,8 +1927,7 @@ H5_DLL herr_t H5Fstop_mdc_logging(hid_t file_id);
*
* \since 1.10.0
*/
-H5_DLL herr_t H5Fget_mdc_logging_status(hid_t file_id, hbool_t *is_enabled,
- hbool_t *is_currently_logging);
+H5_DLL herr_t H5Fget_mdc_logging_status(hid_t file_id, hbool_t *is_enabled, hbool_t *is_currently_logging);
/**
* \ingroup SWMR
*
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 48346c5..975da37 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -328,7 +328,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
hbool_t skip_eof_check = FALSE; /* Whether to skip checking the EOF value */
#ifdef H5_HAVE_PARALLEL
int mpi_size = 1;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE_TAG(H5AC__SUPERBLOCK_TAG)
diff --git a/src/H5Gent.c b/src/H5Gent.c
index fb59d97..c6eabf3 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -421,7 +421,7 @@ H5G__ent_convert(H5F_t *f, H5HL_t *heap, const char *name, const H5O_link_t *lnk
HDassert(!stab_exists);
} /* end else */
#endif /* NDEBUG */
- } /* end if */
+ } /* end if */
else if (obj_type == H5O_TYPE_UNKNOWN) {
/* Try to retrieve symbol table information for caching */
H5O_loc_t targ_oloc; /* Location of link target */
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index a08acca..c66a174 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -97,7 +97,7 @@ H5B_class_t H5B_SNODE[1] = {{
H5G__node_create, /*new */
H5G__node_cmp2, /*cmp2 */
H5G__node_cmp3, /*cmp3 */
- H5G__node_found, /*found */
+ H5G__node_found, /*found */
H5G__node_insert, /*insert */
TRUE, /*follow min branch? */
TRUE, /*follow max branch? */
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index a9a2903..14b7ae7 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -167,7 +167,7 @@ typedef herr_t (*H5G_traverse_t)(H5G_loc_t *grp_loc /*in*/, const char *name,
typedef enum H5G_link_iterate_op_type_t {
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5G_LINK_OP_OLD, /* "Old" application callback */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5G_LINK_OP_NEW /* "New" application callback */
} H5G_link_iterate_op_type_t;
@@ -176,7 +176,7 @@ typedef struct {
union {
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5G_iterate_t op_old; /* "Old" application callback for each link */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5L_iterate2_t op_new; /* "New" application callback for each link */
} op_func;
} H5G_link_iterate_t;
diff --git a/src/H5Groot.c b/src/H5Groot.c
index 29cb46e..d7fbb49 100644
--- a/src/H5Groot.c
+++ b/src/H5Groot.c
@@ -246,8 +246,8 @@ H5G_mkroot(H5F_t *f, hbool_t create_root)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to verify symbol table")
} /* end if */
#endif /* H5_STRICT_FORMAT_CHECKS */
- } /* end if */
- } /* end else */
+ } /* end if */
+ } /* end else */
/* Cache the root group's symbol table information in the root group symbol
* table entry. It will have been allocated by now if it needs to be
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index 13be47a..505718a 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -198,7 +198,7 @@ H5G__traverse_ud(const H5G_loc_t *grp_loc /*in,out*/, const H5O_link_t *lnk, H5G
else
cb_return = (link_class->trav_func)(lnk->name, cur_grp, lnk->u.ud.udata, lnk->u.ud.size,
H5CX_get_lapl(), H5CX_get_dxpl());
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
cb_return = (link_class->trav_func)(lnk->name, cur_grp, lnk->u.ud.udata, lnk->u.ud.size, H5CX_get_lapl(),
H5CX_get_dxpl());
#endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index a9f89e0..0e1304f 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -1304,7 +1304,7 @@ H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG
#ifndef NDEBUG
unsigned nchildren = 0; /* Track # of children */
size_t max_child = 0; /* Track max. child entry used */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
uint32_t metadata_chksum; /* Computed metadata checksum value */
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
@@ -1378,7 +1378,7 @@ H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG
max_child = u;
} /* end if */
#endif /* NDEBUG */
- } /* end for */
+ } /* end for */
/* Compute checksum */
metadata_chksum = H5_checksum_metadata((uint8_t *)_image, (size_t)(image - (uint8_t *)_image), 0);
diff --git a/src/H5HG.c b/src/H5HG.c
index 0a6955e..a50d29f 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -548,7 +548,7 @@ H5HG_insert(H5F_t *f, size_t size, const void *obj, H5HG_t *hobj /*out*/)
HDmemset(heap->obj[idx].begin + H5HG_SIZEOF_OBJHDR(f) + size, 0,
need - (H5HG_SIZEOF_OBJHDR(f) + size));
#endif /* OLD_WAY */
- } /* end if */
+ } /* end if */
heap_flags |= H5AC__DIRTIED_FLAG;
/* Return value */
diff --git a/src/H5Iint.c b/src/H5Iint.c
index 2e1145d..f552256 100644
--- a/src/H5Iint.c
+++ b/src/H5Iint.c
@@ -432,10 +432,9 @@ H5I__destroy_type(H5I_type_t type)
if (type_info == NULL || type_info->init_count <= 0)
HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid type")
- /* Close/clear/destroy all IDs for this type */
- H5E_BEGIN_TRY {
- H5I_clear_type(type, TRUE, FALSE);
- } H5E_END_TRY /* don't care about errors */
+ /* Close/clear/destroy all IDs for this type */
+ H5E_BEGIN_TRY { H5I_clear_type(type, TRUE, FALSE); }
+ H5E_END_TRY /* don't care about errors */
/* Check if we should release the ID class */
if (type_info->cls->flags & H5I_CLASS_IS_APPLICATION)
diff --git a/src/H5Ipkg.h b/src/H5Ipkg.h
index 5d9af13..bd11fd5 100644
--- a/src/H5Ipkg.h
+++ b/src/H5Ipkg.h
@@ -98,10 +98,10 @@ H5_DLLVAR int H5I_next_type_g;
/* Package Private Prototypes */
/******************************/
-H5_DLL int H5I__destroy_type(H5I_type_t type);
-H5_DLL void * H5I__remove_verify(hid_t id, H5I_type_t type);
-H5_DLL int H5I__inc_type_ref(H5I_type_t type);
-H5_DLL int H5I__get_type_ref(H5I_type_t type);
+H5_DLL int H5I__destroy_type(H5I_type_t type);
+H5_DLL void *H5I__remove_verify(hid_t id, H5I_type_t type);
+H5_DLL int H5I__inc_type_ref(H5I_type_t type);
+H5_DLL int H5I__get_type_ref(H5I_type_t type);
H5_DLL H5I_id_info_t *H5I__find_id(hid_t id);
/* Testing functions */
diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h
index ba5eed0..8a393b8 100644
--- a/src/H5Ipublic.h
+++ b/src/H5Ipublic.h
@@ -53,7 +53,9 @@ typedef enum H5I_type_t {
H5I_NTYPES /**< number of library types, MUST BE LAST! */
} H5I_type_t;
-/* Type of IDs to return to users */
+/**
+ * Type of IDs to return to users
+ */
typedef int64_t hid_t;
#define PRIdHID PRId64
diff --git a/src/H5MF.c b/src/H5MF.c
index d4c79df..2fe78a3 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -1202,7 +1202,7 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size)
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: After H5FS_sect_add()\n", FUNC);
#endif /* H5MF_ALLOC_DEBUG_MORE */
- } /* end if */
+ } /* end if */
else {
htri_t merged; /* Whether node was merged */
H5MF_sect_ud_t udata; /* User data for callback */
@@ -1369,7 +1369,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: H5MF__aggr_try_extend = %t\n", FUNC, ret_value);
-#endif /* H5MF_ALLOC_DEBUG_MORE */
+#endif /* H5MF_ALLOC_DEBUG_MORE */
} /* end if */
/* If no extension so far, try to extend into a free-space section */
@@ -1395,7 +1395,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
"error extending block in free space manager")
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: Try to H5FS_sect_try_extend = %t\n", FUNC, ret_value);
-#endif /* H5MF_ALLOC_DEBUG_MORE */
+#endif /* H5MF_ALLOC_DEBUG_MORE */
} /* end if */
/* For paged aggregation and a metadata block: try to extend into page end threshold */
@@ -1406,7 +1406,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
ret_value = TRUE;
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: Try to extend into the page end threshold = %t\n", FUNC, ret_value);
-#endif /* H5MF_ALLOC_DEBUG_MORE */
+#endif /* H5MF_ALLOC_DEBUG_MORE */
} /* end if */
} /* end if */
} /* allow_extend */
@@ -2944,7 +2944,7 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
HDassert(fs_stat.serial_sect_count > 0);
HDassert(fs_stat.alloc_sect_size > 0);
HDassert(fs_stat.alloc_sect_size == fs_stat.sect_size);
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end if */
else {
HDassert(!H5F_addr_defined(fs_stat.addr));
diff --git a/src/H5MFsection.c b/src/H5MFsection.c
index 473c1dc..597da76 100644
--- a/src/H5MFsection.c
+++ b/src/H5MFsection.c
@@ -648,7 +648,7 @@ H5MF__sect_small_add(H5FS_section_info_t **_sect, unsigned *flags, void *_udata)
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: section is dropped\n", FUNC);
#endif /* H5MF_ALLOC_DEBUG_MORE */
- } /* end if */
+ } /* end if */
/* Adjust the section if it is not at page end but its size + prem is at page end */
else if (prem <= H5F_PGEND_META_THRES(udata->f)) {
(*sect)->sect_info.size += prem;
@@ -656,7 +656,7 @@ H5MF__sect_small_add(H5FS_section_info_t **_sect, unsigned *flags, void *_udata)
HDfprintf(stderr, "%s: section is adjusted {%a, %Hu}\n", FUNC, (*sect)->sect_info.addr,
(*sect)->sect_info.size);
#endif /* H5MF_ALLOC_DEBUG_MORE */
- } /* end if */
+ } /* end if */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5MM.c b/src/H5MM.c
index ca358bf..7b49c72 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -52,7 +52,8 @@
/* Memory allocation "block", wrapped around each allocation */
struct H5MM_block_t; /* Forward declaration for typedef */
typedef struct H5MM_block_t {
- unsigned char sig[H5MM_SIG_SIZE]; /* Signature for the block, to indicate it was allocated with H5MM* interface */
+ unsigned char
+ sig[H5MM_SIG_SIZE]; /* Signature for the block, to indicate it was allocated with H5MM* interface */
struct H5MM_block_t *next; /* Pointer to next block in the list of allocated blocks */
struct H5MM_block_t *prev; /* Pointer to previous block in the list of allocated blocks */
union {
@@ -69,7 +70,7 @@ typedef struct H5MM_block_t {
/********************/
/* Local Prototypes */
/********************/
-#if defined H5_MEMORY_ALLOC_SANITY_CHECK
+#if defined H5_MEMORY_ALLOC_SANITY_CHECK
static hbool_t H5MM__is_our_block(void *mem);
static void H5MM__sanity_check_block(const H5MM_block_t *block);
static void H5MM__sanity_check(void *mem);
@@ -270,7 +271,7 @@ H5MM_malloc(size_t size)
H5MM_block_head_s.u.info.in_use = TRUE;
H5MM_init_s = TRUE;
- } /* end if */
+ } /* end if */
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
if (size) {
@@ -308,10 +309,10 @@ H5MM_malloc(size_t size)
} /* end if */
else
ret_value = NULL;
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
ret_value = HDmalloc(size);
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
- } /* end if */
+ } /* end if */
else
ret_value = NULL;
@@ -351,10 +352,10 @@ H5MM_calloc(size_t size)
#if defined H5_MEMORY_ALLOC_SANITY_CHECK
if (NULL != (ret_value = H5MM_malloc(size)))
HDmemset(ret_value, 0, size);
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
ret_value = HDcalloc((size_t)1, size);
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
- } /* end if */
+ } /* end if */
else
ret_value = NULL;
@@ -416,14 +417,14 @@ H5MM_realloc(void *mem, size_t size)
}
else
ret_value = H5MM_xfree(mem);
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
ret_value = HDrealloc(mem, size);
/* Some platforms do not return NULL if size is zero. */
if (0 == size)
ret_value = NULL;
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
- } /* end else */
+ } /* end else */
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5MM_realloc() */
@@ -541,10 +542,10 @@ H5MM_xfree(void *mem)
}
else
HDfree(mem);
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
HDfree(mem);
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
- } /* end if */
+ } /* end if */
FUNC_LEAVE_NOAPI(NULL)
} /* end H5MM_xfree() */
@@ -641,8 +642,8 @@ H5MM_get_alloc_stats(H5_alloc_stats_t *stats)
stats->total_alloc_blocks_count = H5MM_total_alloc_blocks_count_s;
stats->curr_alloc_blocks_count = H5MM_curr_alloc_blocks_count_s;
stats->peak_alloc_blocks_count = H5MM_peak_alloc_blocks_count_s;
- } /* end if */
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+ } /* end if */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
if (stats)
HDmemset(stats, 0, sizeof(H5_alloc_stats_t));
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h
index 7c34a98..d957686 100644
--- a/src/H5MMprivate.h
+++ b/src/H5MMprivate.h
@@ -48,7 +48,7 @@ H5_DLL void * H5MM_xfree(void *mem);
H5_DLL void * H5MM_xfree_const(const void *mem);
H5_DLL void * H5MM_memcpy(void *dest, const void *src, size_t n);
H5_DLL herr_t H5MM_get_alloc_stats(H5_alloc_stats_t *stats);
-#if defined H5_MEMORY_ALLOC_SANITY_CHECK
+#if defined H5_MEMORY_ALLOC_SANITY_CHECK
H5_DLL void H5MM_sanity_check_all(void);
H5_DLL void H5MM_final_sanity_check(void);
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index a2ca561..778e77e 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -995,10 +995,10 @@ H5O__cache_chk_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1284,7 +1284,7 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image
unsigned chunkno; /* Current chunk's index */
#ifndef NDEBUG
unsigned nullcnt; /* Count of null messages (for sanity checking gaps in chunks) */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hbool_t mesgs_modified =
FALSE; /* Whether any messages were modified when the object header was deserialized */
herr_t ret_value = SUCCEED; /* Return value */
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index c1effad..e2e23a9 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -81,7 +81,7 @@ static herr_t H5O__dtype_debug(H5F_t *f, const void *_mesg, FILE *stream, int in
if (H5T__upgrade_version((DT), (VERS)) < 0) \
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade " CLASS " encoding version") \
*(IOF) |= H5O_DECODEIO_DIRTY; \
- } /* end if */
+ } /* end if */
#endif /* H5_STRICT_FORMAT_CHECKS */
/* This message derives from H5O message class */
diff --git a/src/H5Oint.c b/src/H5Oint.c
index 066910f..a49e71b 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -102,25 +102,25 @@ const H5O_msg_class_t *const H5O_msg_class_g[] = {
H5O_MSG_LAYOUT, /*0x0008 Data Layout */
#ifdef H5O_ENABLE_BOGUS
H5O_MSG_BOGUS_VALID, /*0x0009 "Bogus valid" (for testing) */
-#else /* H5O_ENABLE_BOGUS */
+#else /* H5O_ENABLE_BOGUS */
NULL, /*0x0009 "Bogus valid" (for testing) */
-#endif /* H5O_ENABLE_BOGUS */
- H5O_MSG_GINFO, /*0x000A Group information */
- H5O_MSG_PLINE, /*0x000B Data storage -- filter pipeline */
- H5O_MSG_ATTR, /*0x000C Attribute */
- H5O_MSG_NAME, /*0x000D Object name */
- H5O_MSG_MTIME, /*0x000E Object modification date and time */
- H5O_MSG_SHMESG, /*0x000F File-wide shared message table */
- H5O_MSG_CONT, /*0x0010 Object header continuation */
- H5O_MSG_STAB, /*0x0011 Symbol table */
- H5O_MSG_MTIME_NEW, /*0x0012 New Object modification date and time */
- H5O_MSG_BTREEK, /*0x0013 Non-default v1 B-tree 'K' values */
- H5O_MSG_DRVINFO, /*0x0014 Driver info settings */
- H5O_MSG_AINFO, /*0x0015 Attribute information */
- H5O_MSG_REFCOUNT, /*0x0016 Object's ref. count */
- H5O_MSG_FSINFO, /*0x0017 Free-space manager info */
- H5O_MSG_MDCI, /*0x0018 Metadata cache image */
- H5O_MSG_UNKNOWN /*0x0019 Placeholder for unknown message */
+#endif /* H5O_ENABLE_BOGUS */
+ H5O_MSG_GINFO, /*0x000A Group information */
+ H5O_MSG_PLINE, /*0x000B Data storage -- filter pipeline */
+ H5O_MSG_ATTR, /*0x000C Attribute */
+ H5O_MSG_NAME, /*0x000D Object name */
+ H5O_MSG_MTIME, /*0x000E Object modification date and time */
+ H5O_MSG_SHMESG, /*0x000F File-wide shared message table */
+ H5O_MSG_CONT, /*0x0010 Object header continuation */
+ H5O_MSG_STAB, /*0x0011 Symbol table */
+ H5O_MSG_MTIME_NEW, /*0x0012 New Object modification date and time */
+ H5O_MSG_BTREEK, /*0x0013 Non-default v1 B-tree 'K' values */
+ H5O_MSG_DRVINFO, /*0x0014 Driver info settings */
+ H5O_MSG_AINFO, /*0x0015 Attribute information */
+ H5O_MSG_REFCOUNT, /*0x0016 Object's ref. count */
+ H5O_MSG_FSINFO, /*0x0017 Free-space manager info */
+ H5O_MSG_MDCI, /*0x0018 Metadata cache image */
+ H5O_MSG_UNKNOWN /*0x0019 Placeholder for unknown message */
};
/* Format version bounds for object header */
@@ -1075,7 +1075,7 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
H5O_chunk_proxy_t *chk_proxy; /* Proxy for chunk, to bring it into memory */
#ifndef NDEBUG
size_t chkcnt = oh->nchunks; /* Count of chunks (for sanity checking) */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
/* Bring the chunk into the cache */
/* (which adds to the object header) */
@@ -1123,7 +1123,7 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
(oh->nmesgs + udata.common.merged_null_msgs) != udata.v1_pfx_nmesgs)
HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "corrupt object header - incorrect # of messages")
#endif /* H5_STRICT_FORMAT_CHECKS */
- } /* end if */
+ } /* end if */
#ifdef H5O_DEBUG
H5O__assert(oh);
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index fac5269..eece6b0 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -277,10 +277,10 @@ struct H5O_t {
/* (This is to simulate a bug in earlier
* versions of the library)
*/
-#endif /* H5O_ENABLE_BAD_MESG_COUNT */
+#endif /* H5O_ENABLE_BAD_MESG_COUNT */
#ifndef NDEBUG
size_t ndecode_dirtied; /* Number of messages dirtied by decoding */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
/* Chunk management information (not stored) */
size_t rc; /* Reference count of [continuation] chunks using this structure */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 8e338cc..dd7f9c7 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -29,12 +29,12 @@ typedef struct H5O_t H5O_t;
typedef struct H5O_fill_t H5O_fill_t;
/* Include the public header file for this API */
-#include "H5Opublic.h" /* Object header functions */
+#include "H5Opublic.h" /* Object header functions */
/* Public headers needed by this file */
-#include "H5Dpublic.h" /* Dataset functions */
-#include "H5Lpublic.h" /* Link functions */
-#include "H5Spublic.h" /* Dataspace functions */
+#include "H5Dpublic.h" /* Dataset functions */
+#include "H5Lpublic.h" /* Link functions */
+#include "H5Spublic.h" /* Dataspace functions */
/* Private headers needed by this file */
#include "H5private.h" /* Generic Functions */
@@ -232,7 +232,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/H5Opublic.h b/src/H5Opublic.h
index 64408a0..ea44527 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 */
@@ -103,10 +103,10 @@
/* 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_MAP, /* Object is a map */
H5O_TYPE_NTYPES /* Number of different object types (must be last!) */
} H5O_type_t;
@@ -257,13 +257,13 @@ typedef struct H5O_stat_t {
/* (For H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx versions 1 & 2) */
typedef struct H5O_info1_t {
unsigned long fileno; /* File number that object is located in */
- haddr_t addr; /* Object address in file */
+ 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 */
+ 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 */
diff --git a/src/H5Oshared.h b/src/H5Oshared.h
index a8f76aa..aafa069 100644
--- a/src/H5Oshared.h
+++ b/src/H5Oshared.h
@@ -72,10 +72,10 @@ H5O_SHARED_DECODE(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *iofla
#ifdef H5_STRICT_FORMAT_CHECKS
if (*ioflags & H5O_DECODEIO_DIRTY)
HGOTO_ERROR(H5E_OHDR, H5E_UNSUPPORTED, NULL, "unable to mark shared message dirty")
-#else /* H5_STRICT_FORMAT_CHECKS */
+#else /* H5_STRICT_FORMAT_CHECKS */
*ioflags &= ~H5O_DECODEIO_DIRTY;
#endif /* H5_STRICT_FORMAT_CHECKS */
- } /* end if */
+ } /* end if */
else {
/* Decode native message directly */
if (NULL == (ret_value = H5O_SHARED_DECODE_REAL(f, open_oh, mesg_flags, ioflags, p_size, p)))
@@ -237,7 +237,7 @@ H5O_SHARED_DELETE(H5F_t *f, H5O_t *open_oh, void *_mesg)
/* Decrement the reference count on the native message directly */
if (H5O_SHARED_DELETE_REAL(f, open_oh, _mesg) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement ref count for native message")
- } /* end else */
+ } /* end else */
#endif /* H5O_SHARED_DELETE_REAL */
done:
@@ -288,7 +288,7 @@ H5O_SHARED_LINK(H5F_t *f, H5O_t *open_oh, void *_mesg)
/* Increment the reference count on the native message directly */
if (H5O_SHARED_LINK_REAL(f, open_oh, _mesg) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, FAIL, "unable to increment ref count for native message")
- } /* end else */
+ } /* end else */
#endif /* H5O_SHARED_LINK_REAL */
done:
@@ -333,7 +333,7 @@ H5O_SHARED_COPY_FILE(H5F_t *file_src, void *_native_src, H5F_t *file_dst, hbool_
if (NULL == (dst_mesg = H5O_SHARED_COPY_FILE_REAL(file_src, H5O_SHARED_TYPE, _native_src, file_dst,
recompute_size, cpy_info, udata)))
HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy native message to another file")
-#else /* H5O_SHARED_COPY_FILE_REAL */
+#else /* H5O_SHARED_COPY_FILE_REAL */
/* No copy file callback defined, just copy the message itself */
if (NULL == (dst_mesg = (H5O_SHARED_TYPE->copy)(_native_src, NULL)))
HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy native message")
diff --git a/src/H5PLpath.c b/src/H5PLpath.c
index ff4dc0e..3879dc6 100644
--- a/src/H5PLpath.c
+++ b/src/H5PLpath.c
@@ -693,7 +693,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5PL__find_plugin_in_path() */
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
static herr_t
H5PL__find_plugin_in_path(const H5PL_search_params_t *search_params, hbool_t *found, const char *dir,
const void **plugin_info)
diff --git a/src/H5PLpublic.h b/src/H5PLpublic.h
index a08c78d..51f69c9 100644
--- a/src/H5PLpublic.h
+++ b/src/H5PLpublic.h
@@ -99,8 +99,8 @@ H5_DLL herr_t H5PLset_loading_state(unsigned int plugin_control_mask);
* disabled.\n
* A plugin bit set to 1 (one) indicates that that the dynamic plugin type is
* enabled.\n
- * If the value of \p plugin_control_mask is negative, all dynamic plugin types
- * are enabled.\n
+ * If the value of \p plugin_control_mask is negative, all dynamic plugin
+ * types are enabled.\n
* If the value of \p plugin_control_mask is 0 (zero), all dynamic plugins
* are disabled.
* \return \herr_t
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 418d5e3..8c525e5 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -313,7 +313,7 @@ static const H5O_layout_t H5D_def_layout_compact_g = H5D_DEF_LAYOUT_COMPACT;
static const H5O_layout_t H5D_def_layout_contig_g = H5D_DEF_LAYOUT_CONTIG;
static const H5O_layout_t H5D_def_layout_chunk_g = H5D_DEF_LAYOUT_CHUNK;
static const H5O_layout_t H5D_def_layout_virtual_g = H5D_DEF_LAYOUT_VIRTUAL;
-#else /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
+#else /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
static H5O_layout_t H5D_def_layout_compact_g = H5D_DEF_LAYOUT_COMPACT;
static H5O_layout_t H5D_def_layout_contig_g = H5D_DEF_LAYOUT_CONTIG;
static H5O_layout_t H5D_def_layout_chunk_g = H5D_DEF_LAYOUT_CHUNK;
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 09ff894..ac6b988 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -493,7 +493,7 @@ static const hbool_t H5F_def_coll_md_write_flag_g =
H5F_ACS_COLL_MD_WRITE_FLAG_DEF; /* Default setting for the collective metedata write flag */
static const MPI_Comm H5F_def_mpi_params_comm_g = H5F_ACS_MPI_PARAMS_COMM_DEF; /* Default MPI communicator */
static const MPI_Info H5F_def_mpi_params_info_g = H5F_ACS_MPI_PARAMS_INFO_DEF; /* Default MPI info struct */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
static const H5AC_cache_image_config_t H5F_def_mdc_initCacheImageCfg_g =
H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_DEF; /* Default metadata cache image settings */
static const size_t H5F_def_page_buf_size_g = H5F_ACS_PAGE_BUFFER_SIZE_DEF; /* Default page buffer size */
diff --git a/src/H5Pint.c b/src/H5Pint.c
index f67e4d7..001f62b 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -5012,9 +5012,9 @@ done:
herr_t
H5P_close(void *_plist)
{
- H5P_genclass_t *tclass; /* Temporary class pointer */
+ H5P_genclass_t *tclass; /* Temporary class pointer */
H5P_genplist_t *plist = (H5P_genplist_t *)_plist;
- H5SL_t * seen = NULL; /* Skip list to hold names of properties already seen */
+ H5SL_t * seen = NULL; /* Skip list to hold names of properties already seen */
size_t nseen; /* Number of items 'seen' */
hbool_t has_parent_class; /* Flag to indicate that this property list's class has a parent */
size_t ndel; /* Number of items deleted */
diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h
index 075eae0..166f1f2 100644
--- a/src/H5Ppkg.h
+++ b/src/H5Ppkg.h
@@ -86,7 +86,8 @@ struct H5P_genclass_t {
char * name; /* Name of property list class */
H5P_plist_type_t type; /* Type of property */
size_t nprops; /* Number of properties in class */
- unsigned plists; /* Number of property lists that have been created since the last modification to the class */
+ unsigned
+ plists; /* Number of property lists that have been created since the last modification to the class */
unsigned classes; /* Number of classes that have been derived since the last modification to the class */
unsigned ref_count; /* Number of outstanding ID's open on this class object */
hbool_t deleted; /* Whether this class has been deleted and is waiting for dependent classes & proplists
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index a978895..6493895 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -374,7 +374,7 @@ H5_DLL herr_t H5Pclose(hid_t plist_id);
* \since 1.0.0
*
*/
-H5_DLL hid_t H5Pcreate(hid_t cls_id);
+H5_DLL hid_t H5Pcreate(hid_t cls_id);
H5_DLL hid_t H5Pcreate_class(hid_t parent, const char *name, H5P_cls_create_func_t cls_create,
void *create_data, H5P_cls_copy_func_t cls_copy, void *copy_data,
H5P_cls_close_func_t cls_close, void *close_data);
@@ -472,30 +472,27 @@ H5_DLL hid_t H5Pcopy(hid_t plist_id);
* \since 1.8.0
*
*/
-H5_DLL H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned idx,
- unsigned int *flags/*out*/,
- size_t *cd_nelmts/*out*/,
- unsigned cd_values[]/*out*/,
- size_t namelen, char name[],
- unsigned *filter_config /*out*/);
-H5_DLL herr_t H5Pset_attr_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dense);
-H5_DLL herr_t H5Pget_attr_phase_change(hid_t plist_id, unsigned *max_compact, unsigned *min_dense);
-H5_DLL herr_t H5Pset_attr_creation_order(hid_t plist_id, unsigned crt_order_flags);
-H5_DLL herr_t H5Pget_attr_creation_order(hid_t plist_id, unsigned *crt_order_flags);
-H5_DLL herr_t H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times);
-H5_DLL herr_t H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times);
+H5_DLL H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/,
+ size_t *cd_nelmts /*out*/, unsigned cd_values[] /*out*/, size_t namelen,
+ char name[], unsigned *filter_config /*out*/);
+H5_DLL herr_t H5Pset_attr_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dense);
+H5_DLL herr_t H5Pget_attr_phase_change(hid_t plist_id, unsigned *max_compact, unsigned *min_dense);
+H5_DLL herr_t H5Pset_attr_creation_order(hid_t plist_id, unsigned crt_order_flags);
+H5_DLL herr_t H5Pget_attr_creation_order(hid_t plist_id, unsigned *crt_order_flags);
+H5_DLL herr_t H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times);
+H5_DLL herr_t H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times);
H5_DLL herr_t H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
const unsigned int cd_values[/*cd_nelmts*/]);
H5_DLL herr_t H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
const unsigned int c_values[]);
H5_DLL int H5Pget_nfilters(hid_t plist_id);
-H5_DLL herr_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out*/,
- size_t *cd_nelmts /*out*/, unsigned cd_values[] /*out*/, size_t namelen,
- char name[] /*out*/, unsigned *filter_config /*out*/);
-H5_DLL htri_t H5Pall_filters_avail(hid_t plist_id);
-H5_DLL herr_t H5Premove_filter(hid_t plist_id, H5Z_filter_t filter);
-H5_DLL herr_t H5Pset_deflate(hid_t plist_id, unsigned aggression);
-H5_DLL herr_t H5Pset_fletcher32(hid_t plist_id);
+H5_DLL herr_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out*/,
+ size_t *cd_nelmts /*out*/, unsigned cd_values[] /*out*/, size_t namelen,
+ char name[] /*out*/, unsigned *filter_config /*out*/);
+H5_DLL htri_t H5Pall_filters_avail(hid_t plist_id);
+H5_DLL herr_t H5Premove_filter(hid_t plist_id, H5Z_filter_t filter);
+H5_DLL herr_t H5Pset_deflate(hid_t plist_id, unsigned aggression);
+H5_DLL herr_t H5Pset_fletcher32(hid_t plist_id);
/* File creation property list (FCPL) routines */
H5_DLL herr_t H5Pset_userblock(hid_t plist_id, hsize_t size);
@@ -610,7 +607,7 @@ H5_DLL herr_t H5Pget_page_buffer_size(hid_t plist_id, size_t *buf_size, unsigned
* \since 1.0.0
*
*/
-H5_DLL int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/);
+H5_DLL int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[] /*out*/);
/**
*-------------------------------------------------------------------------
*
@@ -683,8 +680,7 @@ H5_DLL herr_t H5Pget_chunk_opts(hid_t plist_id, unsigned *opts);
* \since 1.6.0
*
*/
-H5_DLL herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t
- *fill_time/*out*/);
+H5_DLL herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time /*out*/);
/**
*-------------------------------------------------------------------------
*
@@ -723,8 +719,7 @@ H5_DLL herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t
* \since 1.0.0
*
*/
-H5_DLL herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id,
- void *value/*out*/);
+H5_DLL herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value /*out*/);
/**
*-------------------------------------------------------------------------
* \ingroup DCPL
@@ -941,8 +936,7 @@ H5_DLL herr_t H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time);
* \since 1.0.0
*
*/
-H5_DLL herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id,
- const void *value);
+H5_DLL herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value);
/**
*-------------------------------------------------------------------------
*
@@ -1173,25 +1167,25 @@ H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout);
*
*--------------------------------------------------------------------------
*/
-H5_DLL herr_t H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block);
-H5_DLL herr_t H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *src_file_name,
- const char *src_dset_name, hid_t src_space_id);
-H5_DLL herr_t H5Pget_virtual_count(hid_t dcpl_id, size_t *count /*out*/);
-H5_DLL hid_t H5Pget_virtual_vspace(hid_t dcpl_id, size_t index);
-H5_DLL hid_t H5Pget_virtual_srcspace(hid_t dcpl_id, size_t index);
-H5_DLL ssize_t H5Pget_virtual_filename(hid_t dcpl_id, size_t index, char *name /*out*/, size_t size);
-H5_DLL ssize_t H5Pget_virtual_dsetname(hid_t dcpl_id, size_t index, char *name /*out*/, size_t size);
-H5_DLL herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size);
-H5_DLL int H5Pget_external_count(hid_t plist_id);
-H5_DLL herr_t H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name /*out*/,
- off_t *offset /*out*/, hsize_t *size /*out*/);
-H5_DLL herr_t H5Pset_nbit(hid_t plist_id);
-H5_DLL herr_t H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_factor);
-H5_DLL herr_t H5Pfill_value_defined(hid_t plist, H5D_fill_value_t *status);
-H5_DLL herr_t H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time);
-H5_DLL herr_t H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time /*out*/);
-H5_DLL herr_t H5Pget_dset_no_attrs_hint(hid_t dcpl_id, hbool_t *minimize);
-H5_DLL herr_t H5Pset_dset_no_attrs_hint(hid_t dcpl_id, hbool_t minimize);
+H5_DLL herr_t H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block);
+H5_DLL herr_t H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *src_file_name,
+ const char *src_dset_name, hid_t src_space_id);
+H5_DLL herr_t H5Pget_virtual_count(hid_t dcpl_id, size_t *count /*out*/);
+H5_DLL hid_t H5Pget_virtual_vspace(hid_t dcpl_id, size_t index);
+H5_DLL hid_t H5Pget_virtual_srcspace(hid_t dcpl_id, size_t index);
+H5_DLL ssize_t H5Pget_virtual_filename(hid_t dcpl_id, size_t index, char *name /*out*/, size_t size);
+H5_DLL ssize_t H5Pget_virtual_dsetname(hid_t dcpl_id, size_t index, char *name /*out*/, size_t size);
+H5_DLL herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size);
+H5_DLL int H5Pget_external_count(hid_t plist_id);
+H5_DLL herr_t H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name /*out*/,
+ off_t *offset /*out*/, hsize_t *size /*out*/);
+H5_DLL herr_t H5Pset_nbit(hid_t plist_id);
+H5_DLL herr_t H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_factor);
+H5_DLL herr_t H5Pfill_value_defined(hid_t plist, H5D_fill_value_t *status);
+H5_DLL herr_t H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time);
+H5_DLL herr_t H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time /*out*/);
+H5_DLL herr_t H5Pget_dset_no_attrs_hint(hid_t dcpl_id, hbool_t *minimize);
+H5_DLL herr_t H5Pset_dset_no_attrs_hint(hid_t dcpl_id, hbool_t minimize);
/* Dataset access property list (DAPL) routines */
H5_DLL herr_t H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0);
@@ -1300,15 +1294,15 @@ H5_DLL herr_t H5Pget_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t *func,
/* Typedefs */
/* Function prototypes */
-H5_DLL herr_t H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value,
- H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
- H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_del,
- H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close);
-H5_DLL herr_t H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value,
- H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
- H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
- H5P_prp_close_func_t prp_close);
-H5_DLL herr_t H5Pencode1(hid_t plist_id, void *buf, size_t *nalloc);
+H5_DLL herr_t H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value,
+ H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
+ H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_del,
+ H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close);
+H5_DLL herr_t H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value,
+ H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+ H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+ H5P_prp_close_func_t prp_close);
+H5_DLL herr_t H5Pencode1(hid_t plist_id, void *buf, size_t *nalloc);
/**
*-------------------------------------------------------------------------
* \ingroup OCPL
diff --git a/src/H5SM.c b/src/H5SM.c
index 31f0e10..413d502 100644
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -1092,7 +1092,7 @@ H5SM_try_share(H5F_t *f, H5O_t *open_oh, unsigned defer_flags, unsigned type_id,
if (defer_flags & H5SM_WAS_DEFERRED)
#ifndef NDEBUG
deferred_type = ((H5O_shared_t *)mesg)->type;
-#else /* NDEBUG */
+#else /* NDEBUG */
if ((((H5O_shared_t *)mesg)->type != H5O_SHARE_TYPE_HERE) &&
(((H5O_shared_t *)mesg)->type != H5O_SHARE_TYPE_SOHM))
HGOTO_DONE(FALSE);
@@ -1411,7 +1411,7 @@ H5SM__write_mesg(H5F_t *f, H5O_t *open_oh, H5SM_index_header_t *header, hbool_t
if (defer)
HDmemset(&shared.u, 0, sizeof(shared.u));
#endif /* H5_USING_MEMCHECKER */
- } /* end if */
+ } /* end if */
else {
htri_t share_in_ohdr; /* Whether the new message can be shared in another object's header */
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 90d7d4f..c527cd5 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -2125,7 +2125,7 @@ H5S__hyper_iter_get_seq_list_opt(H5S_sel_iter_t *iter, size_t maxseq, size_t max
/* Decrement number of blocks */
fast_dim_count--;
} /* end while */
-#else /* NO_DUFFS_DEVICE */
+#else /* NO_DUFFS_DEVICE */
{
size_t duffs_index; /* Counting index for Duff's device */
@@ -2168,7 +2168,7 @@ H5S__hyper_iter_get_seq_list_opt(H5S_sel_iter_t *iter, size_t maxseq, size_t max
} while (--duffs_index > 0);
} /* end switch */
}
-#endif /* NO_DUFFS_DEVICE */
+#endif /* NO_DUFFS_DEVICE */
#undef DUFF_GUTS
/* Increment offset in destination buffer */
@@ -11748,7 +11748,7 @@ done:
for (u = 0; u < H5S_MAX_RANK; u++)
HDassert(!udata.ps_span_info[u]);
- } /* end block */
+ } /* end block */
#endif /* NDEBUG */
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index 159e485..66929f9 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -138,10 +138,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 */
@@ -285,21 +285,26 @@ typedef struct {
H5S_sel_copy_func_t copy; /* Method to make a copy of a selection */
H5S_sel_release_func_t release; /* Method to release current selection */
H5S_sel_is_valid_func_t is_valid; /* Method to determine if current selection is valid for dataspace */
- H5S_sel_serial_size_func_t serial_size; /* Method to determine number of bytes required to store current selection */
+ H5S_sel_serial_size_func_t
+ serial_size; /* Method to determine number of bytes required to store current selection */
H5S_sel_serialize_func_t serialize; /* Method to store current selection in "serialized" form (a byte
sequence suitable for storing on disk) */
H5S_sel_deserialize_func_t deserialize; /* Method to store create selection from "serialized" form (a byte
sequence suitable for storing on disk) */
- H5S_sel_bounds_func_t bounds; /* Method to determine to smallest n-D bounding box containing the current selection */
- H5S_sel_offset_func_t offset; /* Method to determine linear offset of initial element in selection within dataspace */
+ H5S_sel_bounds_func_t
+ bounds; /* Method to determine to smallest n-D bounding box containing the current selection */
+ H5S_sel_offset_func_t
+ offset; /* Method to determine linear offset of initial element in selection within dataspace */
H5S_sel_unlim_dim_func_t unlim_dim; /* Method to get unlimited dimension of selection (or -1 for none) */
H5S_sel_num_elem_non_unlim_func_t num_elem_non_unlim; /* Method to get the number of elements in a slice
through the unlimited dimension */
H5S_sel_is_contiguous_func_t is_contiguous; /* Method to determine if current selection is contiguous */
H5S_sel_is_single_func_t is_single; /* Method to determine if current selection is a single block */
H5S_sel_is_regular_func_t is_regular; /* Method to determine if current selection is "regular" */
- H5S_sel_shape_same_func_t shape_same; /* Method to determine if two dataspaces' selections are the same shape */
- H5S_sel_intersect_block_func_t intersect_block; /* Method to determine if a dataspaces' selection intersects a block */
+ H5S_sel_shape_same_func_t
+ shape_same; /* Method to determine if two dataspaces' selections are the same shape */
+ H5S_sel_intersect_block_func_t
+ intersect_block; /* Method to determine if a dataspaces' selection intersects a block */
H5S_sel_adjust_u_func_t adjust_u; /* Method to adjust a selection by an offset */
H5S_sel_adjust_s_func_t adjust_s; /* Method to adjust a selection by an offset (signed) */
H5S_sel_project_scalar project_scalar; /* Method to construct scalar dataspace projection */
@@ -352,13 +357,20 @@ typedef struct H5S_sel_iter_class_t {
H5S_sel_type type; /* Type of selection (all, none, points or hyperslab) */
/* Methods on selections */
- H5S_sel_iter_coords_func_t iter_coords; /* Method to retrieve the current coordinates of iterator for current selection */
- H5S_sel_iter_block_func_t iter_block; /* Method to retrieve the current block of iterator for current selection */
- H5S_sel_iter_nelmts_func_t iter_nelmts; /* Method to determine number of elements left in iterator for current selection */
- H5S_sel_iter_has_next_block_func_t iter_has_next_block; /* Method to query if there is another block left in the selection */
- H5S_sel_iter_next_func_t iter_next; /* Method to move selection iterator to the next element in the selection */
- H5S_sel_iter_next_block_func_t iter_next_block; /* Method to move selection iterator to the next block in the selection */
- H5S_sel_iter_get_seq_list_func_t iter_get_seq_list; /* Method to retrieve a list of offset/length sequences for selection iterator */
+ H5S_sel_iter_coords_func_t
+ iter_coords; /* Method to retrieve the current coordinates of iterator for current selection */
+ H5S_sel_iter_block_func_t
+ iter_block; /* Method to retrieve the current block of iterator for current selection */
+ H5S_sel_iter_nelmts_func_t
+ iter_nelmts; /* Method to determine number of elements left in iterator for current selection */
+ H5S_sel_iter_has_next_block_func_t
+ iter_has_next_block; /* Method to query if there is another block left in the selection */
+ H5S_sel_iter_next_func_t
+ iter_next; /* Method to move selection iterator to the next element in the selection */
+ H5S_sel_iter_next_block_func_t
+ iter_next_block; /* Method to move selection iterator to the next block in the selection */
+ H5S_sel_iter_get_seq_list_func_t
+ iter_get_seq_list; /* Method to retrieve a list of offset/length sequences for selection iterator */
H5S_sel_iter_release_func_t iter_release; /* Method to release iterator for current selection */
} H5S_sel_iter_class_t;
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 966333c..5a38c28 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -843,7 +843,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 */
@@ -1515,8 +1515,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
@@ -1527,8 +1527,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 */
@@ -1539,7 +1539,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) {
@@ -1550,7 +1550,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)
@@ -2345,7 +2345,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/H5Spublic.h b/src/H5Spublic.h
index c16af93..62e2128 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -171,7 +171,7 @@ H5_DLL herr_t H5Sclose(hid_t space_id);
* \since 1.0.0
*
*/
-H5_DLL hid_t H5Screate(H5S_class_t type);
+H5_DLL hid_t H5Screate(H5S_class_t type);
/**
* \ingroup H5S
* \brief Creates a new simple dataspace and opens it for access
@@ -222,7 +222,7 @@ H5_DLL hid_t H5Screate(H5S_class_t type);
* \since 1.0.0
*
*/
-H5_DLL hid_t H5Screate_simple(int rank, const hsize_t dims[], const hsize_t maxdims[]);
+H5_DLL hid_t H5Screate_simple(int rank, const hsize_t dims[], const hsize_t maxdims[]);
/*--------------------------------------------------------------------------*/
/**\ingroup H5S
*
@@ -269,8 +269,7 @@ H5_DLL hssize_t H5Sget_select_npoints(hid_t spaceid);
* \since 1.0.0
*
*/
-H5_DLL int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[],
- hsize_t maxdims[]);
+H5_DLL int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[], hsize_t maxdims[]);
/*-------------------------------------------------------------------------*/
/**\ingroup H5S
*
@@ -394,9 +393,8 @@ H5_DLL int H5Sget_simple_extent_ndims(hid_t space_id);
* \since 1.0.0
*
*/
-H5_DLL herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op,
- const hsize_t start[], const hsize_t stride[], const hsize_t count[],
- const hsize_t block[]);
+H5_DLL herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
+ const hsize_t stride[], const hsize_t count[], const hsize_t block[]);
H5_DLL herr_t H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[], const hsize_t max[]);
H5_DLL hid_t H5Scopy(hid_t space_id);
H5_DLL herr_t H5Sencode2(hid_t obj_id, void *buf, size_t *nalloc, hid_t fapl);
diff --git a/src/H5T.c b/src/H5T.c
index 6f9fa13..295ec55 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -3435,7 +3435,7 @@ H5T__initiate_copy(const H5T_t *old_dt)
(void)H5VL_object_inc_rc(new_dt->shared->owned_vol_obj);
/* Reset vol_obj field */
- new_dt->vol_obj = NULL;
+ new_dt->vol_obj = NULL;
/* Set return value */
ret_value = new_dt;
diff --git a/src/H5TS.c b/src/H5TS.c
index ea309bb..daa5813 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -52,7 +52,7 @@ typedef struct H5TS_cancel_struct {
/********************/
/* Local Prototypes */
/********************/
-static void H5TS__key_destructor(void *key_val);
+static void H5TS__key_destructor(void *key_val);
/*********************/
/* Package Variables */
@@ -65,7 +65,7 @@ static void H5TS__key_destructor(void *key_val);
/* Global variable definitions */
#ifdef H5_HAVE_WIN_THREADS
H5TS_once_t H5TS_first_init_g;
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
H5TS_once_t H5TS_first_init_g = PTHREAD_ONCE_INIT;
#endif /* H5_HAVE_WIN_THREADS */
@@ -73,8 +73,8 @@ H5TS_once_t H5TS_first_init_g = PTHREAD_ONCE_INIT;
H5TS_key_t H5TS_errstk_key_g; /* Error stack */
#ifdef H5_HAVE_CODESTACK
H5TS_key_t H5TS_funcstk_key_g; /* Function stack */
-#endif /* H5_HAVE_CODESTACK */
-H5TS_key_t H5TS_apictx_key_g; /* API context */
+#endif /* H5_HAVE_CODESTACK */
+H5TS_key_t H5TS_apictx_key_g; /* API context */
/*******************/
/* Local Variables */
@@ -340,7 +340,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex)
#ifdef H5_HAVE_WIN_THREADS
EnterCriticalSection(&mutex->CriticalSection);
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Acquire the library lock */
ret_value = pthread_mutex_lock(&mutex->atomic_lock);
if (ret_value)
@@ -395,7 +395,7 @@ H5TS_mutex_unlock(H5TS_mutex_t *mutex)
#ifdef H5_HAVE_WIN_THREADS
/* Releases ownership of the specified critical section object. */
LeaveCriticalSection(&mutex->CriticalSection);
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Decrement the lock count for this thread */
ret_value = pthread_mutex_lock(&mutex->atomic_lock);
@@ -453,7 +453,7 @@ H5TS_cancel_count_inc(void)
#ifdef H5_HAVE_WIN_THREADS
/* unsupported */
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Acquire the thread's cancellation counter */
cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_s);
@@ -478,7 +478,7 @@ H5TS_cancel_count_inc(void)
HDfree(cancel_counter);
return FAIL;
} /* end if */
- } /* end if */
+ } /* end if */
/* Check if thread entering library */
if (cancel_counter->cancel_count == 0)
@@ -526,7 +526,7 @@ H5TS_cancel_count_dec(void)
#ifdef H5_HAVE_WIN_THREADS
/* unsupported */
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
/* Acquire the thread's cancellation counter */
cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_s);
diff --git a/src/H5TSprivate.h b/src/H5TSprivate.h
index dc85145..431e12e 100644
--- a/src/H5TSprivate.h
+++ b/src/H5TSprivate.h
@@ -117,8 +117,8 @@ extern H5TS_once_t H5TS_first_init_g; /* Library initialization */
extern H5TS_key_t H5TS_errstk_key_g; /* Error stacks */
#ifdef H5_HAVE_CODESTACK
extern H5TS_key_t H5TS_funcstk_key_g; /* Function stacks */
-#endif /* H5_HAVE_CODESTACK */
-extern H5TS_key_t H5TS_apictx_key_g; /* API contexts */
+#endif /* H5_HAVE_CODESTACK */
+extern H5TS_key_t H5TS_apictx_key_g; /* API contexts */
/* Library-scope routines */
/* (Only used within H5private.h macros) */
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 4b96e12..8942b4f 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -338,7 +338,8 @@ typedef struct H5T_shared_t {
H5T_class_t type; /*which class of type is this? */
size_t size; /*total size of an instance of this type */
unsigned version; /* Version of object header message to encode this object with */
- hbool_t force_conv; /* Set if this type always needs to be converted and H5T__conv_noop cannot be called */
+ hbool_t
+ force_conv; /* Set if this type always needs to be converted and H5T__conv_noop cannot be called */
struct H5T_t * parent; /*parent type for derived datatypes */
H5VL_object_t *owned_vol_obj; /* Vol object owned by this type (free on close) */
union {
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 97804f1..88a4fb4 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -24,7 +24,7 @@ typedef struct H5T_t H5T_t;
#include "H5Tpublic.h"
/* Other public headers needed by this file */
-#include "H5MMpublic.h" /* Memory management */
+#include "H5MMpublic.h" /* Memory management */
/* Private headers needed by this file */
#include "H5private.h" /* Generic Functions */
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 68a1d79..3bd4c70 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -30,20 +30,20 @@
*/
//! [H5T_class_t_snip]
typedef enum H5T_class_t {
- H5T_NO_CLASS = -1, /**< error */
- H5T_INTEGER = 0, /**< integer types */
- H5T_FLOAT = 1, /**< floating-point types */
- H5T_TIME = 2, /**< date and time types */
- H5T_STRING = 3, /**< character string types */
- H5T_BITFIELD = 4, /**< bit field types */
- H5T_OPAQUE = 5, /**< opaque types */
- H5T_COMPOUND = 6, /**< compound types */
- H5T_REFERENCE = 7, /**< reference types */
- H5T_ENUM = 8, /**< enumeration types */
- H5T_VLEN = 9, /**< variable-Length types */
- H5T_ARRAY = 10, /**< array types */
+ H5T_NO_CLASS = -1, /**< error */
+ H5T_INTEGER = 0, /**< integer types */
+ H5T_FLOAT = 1, /**< floating-point types */
+ H5T_TIME = 2, /**< date and time types */
+ H5T_STRING = 3, /**< character string types */
+ H5T_BITFIELD = 4, /**< bit field types */
+ H5T_OPAQUE = 5, /**< opaque types */
+ H5T_COMPOUND = 6, /**< compound types */
+ H5T_REFERENCE = 7, /**< reference types */
+ H5T_ENUM = 8, /**< enumeration types */
+ H5T_VLEN = 9, /**< variable-Length types */
+ H5T_ARRAY = 10, /**< array types */
- H5T_NCLASSES /**< sentinel: this must be last */
+ H5T_NCLASSES /**< sentinel: this must be last */
} H5T_class_t;
//! [H5T_class_t_snip]
@@ -52,12 +52,12 @@ typedef enum H5T_class_t {
*/
//! [H5T_order_t_snip]
typedef enum H5T_order_t {
- H5T_ORDER_ERROR = -1, /**< error */
- H5T_ORDER_LE = 0, /**< little endian */
- H5T_ORDER_BE = 1, /**< bit endian */
- H5T_ORDER_VAX = 2, /**< VAX mixed endian */
- H5T_ORDER_MIXED = 3, /**< Compound type with mixed member orders */
- H5T_ORDER_NONE = 4 /**< no particular order (strings, bits,..) */
+ H5T_ORDER_ERROR = -1, /**< error */
+ H5T_ORDER_LE = 0, /**< little endian */
+ H5T_ORDER_BE = 1, /**< bit endian */
+ H5T_ORDER_VAX = 2, /**< VAX mixed endian */
+ H5T_ORDER_MIXED = 3, /**< Compound type with mixed member orders */
+ H5T_ORDER_NONE = 4 /**< no particular order (strings, bits,..) */
/*H5T_ORDER_NONE must be last */
} H5T_order_t;
//! [H5T_order_t_snip]
@@ -67,11 +67,11 @@ typedef enum H5T_order_t {
*/
//! [H5T_sign_t_snip]
typedef enum H5T_sign_t {
- H5T_SGN_ERROR = -1, /**< error */
- H5T_SGN_NONE = 0, /**< this is an unsigned type */
- H5T_SGN_2 = 1, /**< two's complement */
+ H5T_SGN_ERROR = -1, /**< error */
+ H5T_SGN_NONE = 0, /**< this is an unsigned type */
+ H5T_SGN_2 = 1, /**< two's complement */
- H5T_NSGN = 2 /** sentinel: this must be last! */
+ H5T_NSGN = 2 /** sentinel: this must be last! */
} H5T_sign_t;
//! [H5T_sign_t_snip]
@@ -80,10 +80,10 @@ typedef enum H5T_sign_t {
*/
//! [H5T_norm_t_snip]
typedef enum H5T_norm_t {
- H5T_NORM_ERROR = -1, /**< error */
- H5T_NORM_IMPLIED = 0, /**< msb of mantissa isn't stored, always 1 */
- H5T_NORM_MSBSET = 1, /**< msb of mantissa is always 1 */
- H5T_NORM_NONE = 2 /**< not normalized */
+ H5T_NORM_ERROR = -1, /**< error */
+ H5T_NORM_IMPLIED = 0, /**< msb of mantissa isn't stored, always 1 */
+ H5T_NORM_MSBSET = 1, /**< msb of mantissa is always 1 */
+ H5T_NORM_NONE = 2 /**< not normalized */
/*H5T_NORM_NONE must be last */
} H5T_norm_t;
//! [H5T_norm_t_snip]
@@ -93,62 +93,62 @@ typedef enum H5T_norm_t {
* \internal Do not change these values since they appear in HDF5 files!
*/
typedef enum H5T_cset_t {
- H5T_CSET_ERROR = -1, /**< error */
- H5T_CSET_ASCII = 0, /**< US ASCII */
- H5T_CSET_UTF8 = 1, /**< UTF-8 Unicode encoding */
- H5T_CSET_RESERVED_2 = 2, /**< reserved for later use */
- H5T_CSET_RESERVED_3 = 3, /**< reserved for later use */
- H5T_CSET_RESERVED_4 = 4, /**< reserved for later use */
- H5T_CSET_RESERVED_5 = 5, /**< reserved for later use */
- H5T_CSET_RESERVED_6 = 6, /**< reserved for later use */
- H5T_CSET_RESERVED_7 = 7, /**< reserved for later use */
- H5T_CSET_RESERVED_8 = 8, /**< reserved for later use */
- H5T_CSET_RESERVED_9 = 9, /**< reserved for later use */
- H5T_CSET_RESERVED_10 = 10, /**< reserved for later use */
- H5T_CSET_RESERVED_11 = 11, /**< reserved for later use */
- H5T_CSET_RESERVED_12 = 12, /**< reserved for later use */
- H5T_CSET_RESERVED_13 = 13, /**< reserved for later use */
- H5T_CSET_RESERVED_14 = 14, /**< reserved for later use */
- H5T_CSET_RESERVED_15 = 15 /**< reserved for later use */
+ H5T_CSET_ERROR = -1, /**< error */
+ H5T_CSET_ASCII = 0, /**< US ASCII */
+ H5T_CSET_UTF8 = 1, /**< UTF-8 Unicode encoding */
+ H5T_CSET_RESERVED_2 = 2, /**< reserved for later use */
+ H5T_CSET_RESERVED_3 = 3, /**< reserved for later use */
+ H5T_CSET_RESERVED_4 = 4, /**< reserved for later use */
+ H5T_CSET_RESERVED_5 = 5, /**< reserved for later use */
+ H5T_CSET_RESERVED_6 = 6, /**< reserved for later use */
+ H5T_CSET_RESERVED_7 = 7, /**< reserved for later use */
+ H5T_CSET_RESERVED_8 = 8, /**< reserved for later use */
+ H5T_CSET_RESERVED_9 = 9, /**< reserved for later use */
+ H5T_CSET_RESERVED_10 = 10, /**< reserved for later use */
+ H5T_CSET_RESERVED_11 = 11, /**< reserved for later use */
+ H5T_CSET_RESERVED_12 = 12, /**< reserved for later use */
+ H5T_CSET_RESERVED_13 = 13, /**< reserved for later use */
+ H5T_CSET_RESERVED_14 = 14, /**< reserved for later use */
+ H5T_CSET_RESERVED_15 = 15 /**< reserved for later use */
} H5T_cset_t;
-#define H5T_NCSET H5T_CSET_RESERVED_2 /*Number of character sets actually defined */
+#define H5T_NCSET H5T_CSET_RESERVED_2 /*Number of character sets actually defined */
/**
* Type of padding to use in character strings.
* \internal Do not change these values since they appear in HDF5 files!
*/
typedef enum H5T_str_t {
- H5T_STR_ERROR = -1, /**< error */
- H5T_STR_NULLTERM = 0, /**< null terminate like in C */
- H5T_STR_NULLPAD = 1, /**< pad with nulls */
- H5T_STR_SPACEPAD = 2, /**< pad with spaces like in Fortran */
- H5T_STR_RESERVED_3 = 3, /**< reserved for later use */
- H5T_STR_RESERVED_4 = 4, /**< reserved for later use */
- H5T_STR_RESERVED_5 = 5, /**< reserved for later use */
- H5T_STR_RESERVED_6 = 6, /**< reserved for later use */
- H5T_STR_RESERVED_7 = 7, /**< reserved for later use */
- H5T_STR_RESERVED_8 = 8, /**< reserved for later use */
- H5T_STR_RESERVED_9 = 9, /**< reserved for later use */
- H5T_STR_RESERVED_10 = 10, /**< reserved for later use */
- H5T_STR_RESERVED_11 = 11, /**< reserved for later use */
- H5T_STR_RESERVED_12 = 12, /**< reserved for later use */
- H5T_STR_RESERVED_13 = 13, /**< reserved for later use */
- H5T_STR_RESERVED_14 = 14, /**< reserved for later use */
- H5T_STR_RESERVED_15 = 15 /**< reserved for later use */
+ H5T_STR_ERROR = -1, /**< error */
+ H5T_STR_NULLTERM = 0, /**< null terminate like in C */
+ H5T_STR_NULLPAD = 1, /**< pad with nulls */
+ H5T_STR_SPACEPAD = 2, /**< pad with spaces like in Fortran */
+ H5T_STR_RESERVED_3 = 3, /**< reserved for later use */
+ H5T_STR_RESERVED_4 = 4, /**< reserved for later use */
+ H5T_STR_RESERVED_5 = 5, /**< reserved for later use */
+ H5T_STR_RESERVED_6 = 6, /**< reserved for later use */
+ H5T_STR_RESERVED_7 = 7, /**< reserved for later use */
+ H5T_STR_RESERVED_8 = 8, /**< reserved for later use */
+ H5T_STR_RESERVED_9 = 9, /**< reserved for later use */
+ H5T_STR_RESERVED_10 = 10, /**< reserved for later use */
+ H5T_STR_RESERVED_11 = 11, /**< reserved for later use */
+ H5T_STR_RESERVED_12 = 12, /**< reserved for later use */
+ H5T_STR_RESERVED_13 = 13, /**< reserved for later use */
+ H5T_STR_RESERVED_14 = 14, /**< reserved for later use */
+ H5T_STR_RESERVED_15 = 15 /**< reserved for later use */
} H5T_str_t;
-#define H5T_NSTR H5T_STR_RESERVED_3 /*num H5T_str_t types actually defined */
+#define H5T_NSTR H5T_STR_RESERVED_3 /*num H5T_str_t types actually defined */
/**
* Type of padding to use in other atomic types
*/
//! [H5T_pad_t_snip]
typedef enum H5T_pad_t {
- H5T_PAD_ERROR = -1, /**< error */
- H5T_PAD_ZERO = 0, /**< always set to zero */
- H5T_PAD_ONE = 1, /**< always set to one */
- H5T_PAD_BACKGROUND = 2, /**< set to background value */
+ H5T_PAD_ERROR = -1, /**< error */
+ H5T_PAD_ZERO = 0, /**< always set to zero */
+ H5T_PAD_ONE = 1, /**< always set to one */
+ H5T_PAD_BACKGROUND = 2, /**< set to background value */
- H5T_NPAD = 3 /**< sentinal: THIS MUST BE LAST */
+ H5T_NPAD = 3 /**< sentinal: THIS MUST BE LAST */
} H5T_pad_t;
//! [H5T_pad_t_snip]
@@ -156,18 +156,18 @@ typedef enum H5T_pad_t {
* Commands sent to conversion functions
*/
typedef enum H5T_cmd_t {
- H5T_CONV_INIT = 0, /**< query and/or initialize private data */
- H5T_CONV_CONV = 1, /**< convert data from source to dest datatype */
- H5T_CONV_FREE = 2 /**< function is being removed from path */
+ H5T_CONV_INIT = 0, /**< query and/or initialize private data */
+ H5T_CONV_CONV = 1, /**< convert data from source to dest datatype */
+ H5T_CONV_FREE = 2 /**< function is being removed from path */
} H5T_cmd_t;
/**
* How is the `bkg' buffer used by the conversion function?
*/
typedef enum H5T_bkg_t {
- H5T_BKG_NO = 0, /**< background buffer is not needed, send NULL */
- H5T_BKG_TEMP = 1, /**< bkg buffer used as temp storage only */
- H5T_BKG_YES = 2 /**< init bkg buf with data before conversion */
+ H5T_BKG_NO = 0, /**< background buffer is not needed, send NULL */
+ H5T_BKG_TEMP = 1, /**< bkg buffer used as temp storage only */
+ H5T_BKG_YES = 2 /**< init bkg buf with data before conversion */
} H5T_bkg_t;
/**
@@ -175,10 +175,10 @@ typedef enum H5T_bkg_t {
*/
//! [H5T_cdata_t_snip]
typedef struct H5T_cdata_t {
- H5T_cmd_t command;/**< what should the conversion function do? */
- H5T_bkg_t need_bkg;/**< is the background buffer needed? */
- hbool_t recalc; /**< recalculate private data */
- void *priv; /**< private data */
+ H5T_cmd_t command; /**< what should the conversion function do? */
+ H5T_bkg_t need_bkg; /**< is the background buffer needed? */
+ hbool_t recalc; /**< recalculate private data */
+ void * priv; /**< private data */
} H5T_cdata_t;
//! [H5T_cdata_t_snip]
@@ -186,9 +186,9 @@ typedef struct H5T_cdata_t {
* Conversion function persistence
*/
typedef enum H5T_pers_t {
- H5T_PERS_DONTCARE = -1, /**< wild card */
- H5T_PERS_HARD = 0, /**< hard conversion function */
- H5T_PERS_SOFT = 1 /**< soft conversion function */
+ H5T_PERS_DONTCARE = -1, /**< wild card */
+ H5T_PERS_HARD = 0, /**< hard conversion function */
+ H5T_PERS_SOFT = 1 /**< soft conversion function */
} H5T_pers_t;
/**
@@ -196,9 +196,9 @@ typedef enum H5T_pers_t {
*/
//! [H5T_direction_t_snip]
typedef enum H5T_direction_t {
- H5T_DIR_DEFAULT = 0, /**< default direction is inscendent */
- H5T_DIR_ASCEND = 1, /**< in inscendent order */
- H5T_DIR_DESCEND = 2 /**< in descendent order */
+ H5T_DIR_DEFAULT = 0, /**< default direction is inscendent */
+ H5T_DIR_ASCEND = 1, /**< in inscendent order */
+ H5T_DIR_DESCEND = 2 /**< in descendent order */
} H5T_direction_t;
//! [H5T_direction_t_snip]
@@ -206,22 +206,22 @@ typedef enum H5T_direction_t {
* The exception type passed into the conversion callback function
*/
typedef enum H5T_conv_except_t {
- H5T_CONV_EXCEPT_RANGE_HI = 0, /**< source value is greater than destination's range */
- H5T_CONV_EXCEPT_RANGE_LOW = 1, /**< source value is less than destination's range */
- H5T_CONV_EXCEPT_PRECISION = 2, /**< source value loses precision in destination */
- H5T_CONV_EXCEPT_TRUNCATE = 3, /**< source value is truncated in destination */
- H5T_CONV_EXCEPT_PINF = 4, /**< source value is positive infinity(floating number) */
- H5T_CONV_EXCEPT_NINF = 5, /**< source value is negative infinity(floating number) */
- H5T_CONV_EXCEPT_NAN = 6 /**< source value is NaN(floating number) */
+ H5T_CONV_EXCEPT_RANGE_HI = 0, /**< source value is greater than destination's range */
+ H5T_CONV_EXCEPT_RANGE_LOW = 1, /**< source value is less than destination's range */
+ H5T_CONV_EXCEPT_PRECISION = 2, /**< source value loses precision in destination */
+ H5T_CONV_EXCEPT_TRUNCATE = 3, /**< source value is truncated in destination */
+ H5T_CONV_EXCEPT_PINF = 4, /**< source value is positive infinity(floating number) */
+ H5T_CONV_EXCEPT_NINF = 5, /**< source value is negative infinity(floating number) */
+ H5T_CONV_EXCEPT_NAN = 6 /**< source value is NaN(floating number) */
} H5T_conv_except_t;
/**
* The return value from conversion callback function H5T_conv_except_func_t()
*/
typedef enum H5T_conv_ret_t {
- H5T_CONV_ABORT = -1, /**< abort conversion */
- H5T_CONV_UNHANDLED = 0, /**< callback function failed to handle the exception */
- H5T_CONV_HANDLED = 1 /**< callback function handled the exception successfully */
+ H5T_CONV_ABORT = -1, /**< abort conversion */
+ H5T_CONV_UNHANDLED = 0, /**< callback function failed to handle the exception */
+ H5T_CONV_HANDLED = 1 /**< callback function handled the exception successfully */
} H5T_conv_ret_t;
/**
diff --git a/src/H5Tref.c b/src/H5Tref.c
index bea0963..d87401e 100644
--- a/src/H5Tref.c
+++ b/src/H5Tref.c
@@ -182,7 +182,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
/* Release owned file */
if (dt->shared->owned_vol_obj) {
- if(H5VL_free_object(dt->shared->owned_vol_obj) < 0)
+ if (H5VL_free_object(dt->shared->owned_vol_obj) < 0)
HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCLOSEOBJ, FAIL, "unable to close owned VOL object")
dt->shared->owned_vol_obj = NULL;
} /* end if */
@@ -597,10 +597,10 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
H5VL_object_t H5_ATTR_UNUSED *dst_file, void *dst_buf, size_t dst_size,
void H5_ATTR_UNUSED *bg_buf)
{
- H5F_t * src_f = NULL;
- hid_t file_id = H5I_INVALID_HID;
- H5R_ref_priv_t *dst_ref = (H5R_ref_priv_t *)dst_buf;
- H5R_ref_priv_t tmp_ref; /* Temporary reference to decode into */
+ H5F_t * src_f = NULL;
+ hid_t file_id = H5I_INVALID_HID;
+ H5R_ref_priv_t *dst_ref = (H5R_ref_priv_t *)dst_buf;
+ H5R_ref_priv_t tmp_ref; /* Temporary reference to decode into */
herr_t ret_value = SUCCEED;
FUNC_ENTER_STATIC
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index 4564e0a..325b02e 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -284,7 +284,7 @@ H5T__vlen_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
/* Release owned file */
if (dt->shared->owned_vol_obj) {
- if(H5VL_free_object(dt->shared->owned_vol_obj) < 0)
+ if (H5VL_free_object(dt->shared->owned_vol_obj) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCLOSEOBJ, FAIL, "unable to close owned VOL object")
dt->shared->owned_vol_obj = NULL;
} /* end if */
@@ -637,7 +637,7 @@ H5T__vlen_mem_str_getptr(void *_vl)
#ifdef H5_NO_ALIGNMENT_RESTRICTIONS
char *s = *(char **)_vl; /* Pointer to the user's string information */
#else
- char *s = NULL; /* Pointer to the user's string information */
+ char * s = NULL; /* Pointer to the user's string information */
#endif
FUNC_ENTER_STATIC_NOERR
@@ -728,7 +728,7 @@ H5T__vlen_mem_str_read(H5VL_object_t H5_ATTR_UNUSED *file, void *_vl, void *buf,
#ifdef H5_NO_ALIGNMENT_RESTRICTIONS
char *s = *(char **)_vl; /* Pointer to the user's string information */
#else
- char *s; /* Pointer to the user's string information */
+ char *s; /* Pointer to the user's string information */
#endif
FUNC_ENTER_STATIC_NOERR
diff --git a/src/H5VL.c b/src/H5VL.c
index 2e63ed9..98d660b 100644
--- a/src/H5VL.c
+++ b/src/H5VL.c
@@ -92,8 +92,7 @@ H5VLregister_connector(const H5VL_class_t *cls, hid_t vipl_id)
HGOTO_ERROR(H5E_ARGS, H5E_UNINITIALIZED, H5I_INVALID_HID,
"VOL connector class pointer cannot be NULL")
if (H5VL_VERSION != cls->version)
- HGOTO_ERROR(H5E_VOL, H5E_CANTREGISTER, H5I_INVALID_HID,
- "VOL connector has incompatible version")
+ HGOTO_ERROR(H5E_VOL, H5E_CANTREGISTER, H5I_INVALID_HID, "VOL connector has incompatible version")
if (!cls->name)
HGOTO_ERROR(H5E_VOL, H5E_CANTREGISTER, H5I_INVALID_HID,
"VOL connector class name cannot be the NULL pointer")
@@ -706,7 +705,8 @@ H5VLget_file_type(void *file_obj, hid_t connector_id, hid_t dtype_id)
/* Create VOL object for file if necessary (force_conv will be TRUE if and
* only if file needs to be passed to H5T_set_loc) */
- if (H5T_GET_FORCE_CONV(dtype) && (NULL == (file_vol_obj = H5VL_create_object_using_vol_id(H5I_FILE, file_obj, connector_id))))
+ if (H5T_GET_FORCE_CONV(dtype) &&
+ (NULL == (file_vol_obj = H5VL_create_object_using_vol_id(H5I_FILE, file_obj, connector_id))))
HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, FAIL, "can't create VOL object")
/* Copy the datatype */
diff --git a/src/H5VLcallback.c b/src/H5VLcallback.c
index 4657213..95a6c52 100644
--- a/src/H5VLcallback.c
+++ b/src/H5VLcallback.c
@@ -29,7 +29,7 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
+#include "H5Fprivate.h" /* File access */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
diff --git a/src/H5VLint.c b/src/H5VLint.c
index b44d436..5d9169d 100644
--- a/src/H5VLint.c
+++ b/src/H5VLint.c
@@ -1020,7 +1020,7 @@ H5VL_free_object(H5VL_object_t *vol_obj)
/* Check arguments */
HDassert(vol_obj);
- if(--vol_obj->rc == 0) {
+ if (--vol_obj->rc == 0) {
/* Decrement refcount on connector */
if (H5VL__conn_dec_rc(vol_obj->connector) < 0)
HGOTO_ERROR(H5E_VOL, H5E_CANTDEC, FAIL, "unable to decrement ref count on VOL connector")
@@ -2426,7 +2426,7 @@ done:
herr_t
H5VL_check_plugin_load(const H5VL_class_t *cls, const H5PL_key_t *key, hbool_t *success)
{
- herr_t ret_value = SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -2439,16 +2439,16 @@ H5VL_check_plugin_load(const H5VL_class_t *cls, const H5PL_key_t *key, hbool_t *
if (key->vol.kind == H5VL_GET_CONNECTOR_BY_NAME) {
/* Check if plugin name matches VOL connector class name */
if (cls->name && !HDstrcmp(cls->name, key->vol.u.name))
- *success = TRUE;
- } /* end if */
+ *success = TRUE;
+ } /* end if */
else {
/* Sanity check */
HDassert(key->vol.kind == H5VL_GET_CONNECTOR_BY_VALUE);
/* Check if plugin value matches VOL connector class value */
if (cls->value == key->vol.u.value)
- *success = TRUE;
- } /* end else */
+ *success = TRUE;
+ } /* end else */
/* Connector is a match, but might not be a compatible version */
if (*success && cls->version != H5VL_VERSION)
diff --git a/src/H5VLnative.c b/src/H5VLnative.c
index ead3beb..f8d26e1 100644
--- a/src/H5VLnative.c
+++ b/src/H5VLnative.c
@@ -19,23 +19,23 @@
/* Module Setup */
/****************/
-#define H5VL_FRIEND /* Suppress error about including H5VLpkg */
+#define H5VL_FRIEND /* Suppress error about including H5VLpkg */
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5Aprivate.h" /* Attributes */
-#include "H5Dprivate.h" /* Datasets */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* Files */
-#include "H5Gprivate.h" /* Groups */
-#include "H5Iprivate.h" /* IDs */
-#include "H5Oprivate.h" /* Object headers */
-#include "H5Pprivate.h" /* Property lists */
-#include "H5Tprivate.h" /* Datatypes */
-#include "H5VLpkg.h" /* Virtual Object Layer */
+#include "H5private.h" /* Generic Functions */
+#include "H5Aprivate.h" /* Attributes */
+#include "H5Dprivate.h" /* Datasets */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5Fprivate.h" /* Files */
+#include "H5Gprivate.h" /* Groups */
+#include "H5Iprivate.h" /* IDs */
+#include "H5Oprivate.h" /* Object headers */
+#include "H5Pprivate.h" /* Property lists */
+#include "H5Tprivate.h" /* Datatypes */
+#include "H5VLpkg.h" /* Virtual Object Layer */
#include "H5VLnative_private.h" /* Native VOL connector */
@@ -47,12 +47,12 @@ static herr_t H5VL__native_term(void);
/* Native VOL connector class struct */
static const H5VL_class_t H5VL_native_cls_g = {
- H5VL_VERSION, /* VOL class struct version */
- H5VL_NATIVE_VALUE, /* value */
- H5VL_NATIVE_NAME, /* name */
- 0, /* capability flags */
- NULL, /* initialize */
- H5VL__native_term, /* terminate */
+ H5VL_VERSION, /* VOL class struct version */
+ H5VL_NATIVE_VALUE, /* value */
+ H5VL_NATIVE_NAME, /* name */
+ 0, /* capability flags */
+ NULL, /* initialize */
+ H5VL__native_term, /* terminate */
{
/* info_cls */
(size_t)0, /* info size */
diff --git a/src/H5VLprivate.h b/src/H5VLprivate.h
index e3ff040..df860ca 100644
--- a/src/H5VLprivate.h
+++ b/src/H5VLprivate.h
@@ -14,7 +14,7 @@
#define _H5VLprivate_H
/* Include package's public header */
-#include "H5VLpublic.h" /* Generic Functions */
+#include "H5VLpublic.h" /* Generic Functions */
/* Private headers needed by this file */
@@ -37,7 +37,7 @@ typedef struct H5VL_t {
typedef struct H5VL_object_t {
void * data; /* Pointer to connector-managed data for this object */
H5VL_t *connector; /* Pointer to VOL connector struct */
- size_t rc; /* Reference count */
+ size_t rc; /* Reference count */
} H5VL_object_t;
/* Internal structure to hold the connector ID & info for FAPLs */
diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h
index a492291..02ba0fb 100644
--- a/src/H5VLpublic.h
+++ b/src/H5VLpublic.h
@@ -84,19 +84,19 @@ typedef int H5VL_class_value_t;
* (Used for various queries, etc)
*/
typedef enum H5VL_subclass_t {
- H5VL_SUBCLS_NONE, /**< Operations outside of a subclass */
- H5VL_SUBCLS_INFO, /**< 'Info' subclass */
- H5VL_SUBCLS_WRAP, /**< 'Wrap' subclass */
- H5VL_SUBCLS_ATTR, /**< 'Attribute' subclass */
- H5VL_SUBCLS_DATASET, /**< 'Dataset' subclass */
- H5VL_SUBCLS_DATATYPE, /**< 'Named datatype' subclass */
- H5VL_SUBCLS_FILE, /**< 'File' subclass */
- H5VL_SUBCLS_GROUP, /**< 'Group' subclass */
- H5VL_SUBCLS_LINK, /**< 'Link' subclass */
- H5VL_SUBCLS_OBJECT, /**< 'Object' subclass */
- H5VL_SUBCLS_REQUEST, /**< 'Request' subclass */
- H5VL_SUBCLS_BLOB, /**< 'Blob' subclass */
- H5VL_SUBCLS_TOKEN /**< 'Token' subclass */
+ H5VL_SUBCLS_NONE, /**< Operations outside of a subclass */
+ H5VL_SUBCLS_INFO, /**< 'Info' subclass */
+ H5VL_SUBCLS_WRAP, /**< 'Wrap' subclass */
+ H5VL_SUBCLS_ATTR, /**< 'Attribute' subclass */
+ H5VL_SUBCLS_DATASET, /**< 'Dataset' subclass */
+ H5VL_SUBCLS_DATATYPE, /**< 'Named datatype' subclass */
+ H5VL_SUBCLS_FILE, /**< 'File' subclass */
+ H5VL_SUBCLS_GROUP, /**< 'Group' subclass */
+ H5VL_SUBCLS_LINK, /**< 'Link' subclass */
+ H5VL_SUBCLS_OBJECT, /**< 'Object' subclass */
+ H5VL_SUBCLS_REQUEST, /**< 'Request' subclass */
+ H5VL_SUBCLS_BLOB, /**< 'Blob' subclass */
+ H5VL_SUBCLS_TOKEN /**< 'Token' subclass */
} H5VL_subclass_t;
/********************/
diff --git a/src/H5VM.c b/src/H5VM.c
index 72ec045..14737d2 100644
--- a/src/H5VM.c
+++ b/src/H5VM.c
@@ -486,7 +486,7 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size, const hsize_t *dst_size, const
#ifdef NO_INLINED_CODE
dst_start = H5VM_hyper_stride(n, size, dst_size, dst_offset, dst_stride);
src_start = H5VM_hyper_stride(n, size, src_size, src_offset, src_stride);
-#else /* NO_INLINED_CODE */
+#else /* NO_INLINED_CODE */
/* in-line version of two calls to H5VM_hyper_stride() */
{
hsize_t dst_acc; /*accumulator */
diff --git a/src/H5Z.c b/src/H5Z.c
index 7f7a450..5814c9d 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -47,7 +47,7 @@ typedef struct H5Z_object_t {
#ifdef H5_HAVE_PARALLEL
hbool_t
sanity_checked; /* Whether the sanity check for collectively calling H5Zunregister has been done */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
} H5Z_object_t;
/* Enumerated type for dataset creation prelude callbacks */
@@ -181,7 +181,7 @@ next:
} /* end for */
} /* end for */
} /* end if */
-#endif /* H5Z_DEBUG */
+#endif /* H5Z_DEBUG */
/* Free the table of filters */
if (H5Z_table_g) {
@@ -255,11 +255,11 @@ H5Zregister(const void *cls)
/* Set cls_real to point to the translated structure */
cls_real = &cls_new;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
/* Deprecated symbols not allowed, throw an error */
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid H5Z_class_t version number");
#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+ } /* end if */
if (cls_real->id < 0 || cls_real->id > H5Z_FILTER_MAX)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identification number")
@@ -327,7 +327,7 @@ H5Z_register(const H5Z_class2_t *cls)
#ifdef H5Z_DEBUG
HDmemset(H5Z_stat_table_g + i, 0, sizeof(H5Z_stats_t));
#endif /* H5Z_DEBUG */
- } /* end if */
+ } /* end if */
/* Filter already registered */
else {
/* Replace old contents */
@@ -587,7 +587,7 @@ H5Z__flush_file_cb(void *obj_ptr, hid_t H5_ATTR_UNUSED obj_id, void H5_ATTR_PARA
H5F_t *f = (H5F_t *)obj_ptr; /* File object for operations */
#ifdef H5_HAVE_PARALLEL
H5Z_object_t *object = (H5Z_object_t *)key;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
int ret_value = FALSE; /* Return value */
FUNC_ENTER_STATIC
@@ -632,7 +632,7 @@ H5Z__flush_file_cb(void *obj_ptr, hid_t H5_ATTR_UNUSED obj_id, void H5_ATTR_PARA
if (H5P_USER_TRUE == coll_md_read)
H5CX_set_coll_metadata_read(TRUE);
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* Call the flush routine for mounted file hierarchies */
if (H5F_flush_mounts((H5F_t *)obj_ptr) < 0)
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 56047ae..70278c3 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -216,10 +216,10 @@ typedef enum H5Z_SO_scale_type_t {
* Values to decide if EDC is enabled for reading data
*/
typedef enum H5Z_EDC_t {
- H5Z_ERROR_EDC = -1, /**< error value */
- H5Z_DISABLE_EDC = 0,
- H5Z_ENABLE_EDC = 1,
- H5Z_NO_EDC = 2 /**< sentinel */
+ H5Z_ERROR_EDC = -1, /**< error value */
+ H5Z_DISABLE_EDC = 0,
+ H5Z_ENABLE_EDC = 1,
+ H5Z_NO_EDC = 2 /**< sentinel */
} H5Z_EDC_t;
/* Bit flags for H5Zget_filter_info */
@@ -230,10 +230,10 @@ typedef enum H5Z_EDC_t {
* Return values for filter callback function
*/
typedef enum H5Z_cb_return_t {
- H5Z_CB_ERROR = -1,
- H5Z_CB_FAIL = 0, /**< I/O should fail if filter fails. */
- H5Z_CB_CONT = 1, /**< I/O continues if filter fails. */
- H5Z_CB_NO = 2
+ H5Z_CB_ERROR = -1,
+ H5Z_CB_FAIL = 0, /**< I/O should fail if filter fails. */
+ H5Z_CB_CONT = 1, /**< I/O continues if filter fails. */
+ H5Z_CB_NO = 2
} H5Z_cb_return_t;
/**
diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c
index 354d4df..2e3ff97 100644
--- a/src/H5Zshuffle.c
+++ b/src/H5Zshuffle.c
@@ -123,7 +123,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
size_t i; /* Local index variables */
#ifdef NO_DUFFS_DEVICE
size_t j; /* Local index variable */
-#endif /* NO_DUFFS_DEVICE */
+#endif /* NO_DUFFS_DEVICE */
size_t leftover; /* Extra bytes at end of buffer */
size_t ret_value = 0; /* Return value */
@@ -165,7 +165,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
j--;
} /* end for */
-#else /* NO_DUFFS_DEVICE */
+#else /* NO_DUFFS_DEVICE */
{
size_t duffs_index; /* Counting index for Duff's device */
@@ -208,7 +208,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
} while (--duffs_index > 0);
} /* end switch */
}
-#endif /* NO_DUFFS_DEVICE */
+#endif /* NO_DUFFS_DEVICE */
#undef DUFF_GUTS
} /* end for */
@@ -236,7 +236,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
j--;
} /* end for */
-#else /* NO_DUFFS_DEVICE */
+#else /* NO_DUFFS_DEVICE */
{
size_t duffs_index; /* Counting index for Duff's device */
@@ -279,7 +279,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
} while (--duffs_index > 0);
} /* end switch */
}
-#endif /* NO_DUFFS_DEVICE */
+#endif /* NO_DUFFS_DEVICE */
#undef DUFF_GUTS
} /* end for */
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index cde1862..e6d8d3f 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -13,12 +13,12 @@
#include "H5Zmodule.h" /* This source code file is part of the H5Z module */
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5Iprivate.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
-#include "H5VMprivate.h" /* H5VM_array_fill */
-#include "H5Zpkg.h" /* Data filters */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5Iprivate.h" /* IDs */
+#include "H5MMprivate.h" /* Memory management */
+#include "H5VMprivate.h" /* H5VM_array_fill */
+#include "H5Zpkg.h" /* Data filters */
/* Token types */
typedef enum {
@@ -994,12 +994,12 @@ done:
/*-------------------------------------------------------------------------
* Function: H5Z_xform_eval
- * Purpose: If the transform is trivial, this function applies it.
- * Otherwise, it calls H5Z__xform_eval_full to do the full
- * transform.
+ * Purpose: If the transform is trivial, this function applies it.
+ * Otherwise, it calls H5Z__xform_eval_full to do the full
+ * transform.
* Return: SUCCEED if transform applied successfully, FAIL otherwise
* Programmer: Leon Arber
- * 5/1/04
+ * 5/1/04
*
*-------------------------------------------------------------------------
*/
@@ -1033,7 +1033,7 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void *array, size_t array_size
#if CHAR_MIN >= 0
else if (array_type == H5T_NATIVE_SCHAR)
H5Z_XFORM_DO_OP5(signed char, array_size)
-#else /* CHAR_MIN >= 0 */
+#else /* CHAR_MIN >= 0 */
else if (array_type == H5T_NATIVE_UCHAR)
H5Z_XFORM_DO_OP5(unsigned char, array_size)
#endif /* CHAR_MIN >= 0 */
@@ -1110,8 +1110,8 @@ done:
/*-------------------------------------------------------------------------
* Function: H5Z__xform_eval_full
*
- * Purpose: Does a full evaluation of the parse tree contained in tree
- * and applies this transform to array.
+ * Purpose: Does a full evaluation of the parse tree contained in tree
+ * and applies this transform to array.
*
* 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
@@ -1121,7 +1121,7 @@ done:
* Return: Nothing
*
* Programmer: Leon Arber
- * 5/1/04
+ * 5/1/04
*
*-------------------------------------------------------------------------
*/
@@ -1753,7 +1753,7 @@ H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop)
* Function: H5Z_xform_extract_xform_str
*
* Purpose: Extracts the pointer to the data transform strings from the
- * data transform property.`
+ * data transform property.`
* Return:
* Pointer to a copy of the string in the data_xform property.
*
diff --git a/src/H5detect.c b/src/H5detect.c
index e383d9b..973cd97 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -1140,7 +1140,7 @@ print_header(void)
#ifdef H5_HAVE_GETPWUID
struct passwd *pwd = NULL;
#else
- int pwd = 1;
+ int pwd = 1;
#endif
static const char *month_name[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
index 2afa531..617d1f5 100644
--- a/src/H5make_libsettings.c
+++ b/src/H5make_libsettings.c
@@ -144,7 +144,7 @@ print_header(void)
#ifdef H5_HAVE_GETPWUID
struct passwd *pwd = NULL;
#else
- int pwd = 1;
+ int pwd = 1;
#endif
static const char *month_name[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
diff --git a/src/H5private.h b/src/H5private.h
index 38742ed..600089d 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -480,11 +480,11 @@ typedef unsigned char uint8_t;
#if H5_SIZEOF_INT16_T >= 2
#elif H5_SIZEOF_SHORT >= 2
-typedef short int16_t;
+typedef short int16_t;
#undef H5_SIZEOF_INT16_T
#define H5_SIZEOF_INT16_T H5_SIZEOF_SHORT
#elif H5_SIZEOF_INT >= 2
-typedef int int16_t;
+typedef int int16_t;
#undef H5_SIZEOF_INT16_T
#define H5_SIZEOF_INT16_T H5_SIZEOF_INT
#else
@@ -506,11 +506,11 @@ typedef unsigned uint16_t;
#if H5_SIZEOF_INT32_T >= 4
#elif H5_SIZEOF_SHORT >= 4
-typedef short int32_t;
+typedef short int32_t;
#undef H5_SIZEOF_INT32_T
#define H5_SIZEOF_INT32_T H5_SIZEOF_SHORT
#elif H5_SIZEOF_INT >= 4
-typedef int int32_t;
+typedef int int32_t;
#undef H5_SIZEOF_INT32_T
#define H5_SIZEOF_INT32_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG >= 4
@@ -682,7 +682,7 @@ typedef struct {
#endif /* HDabs */
#ifndef HDaccept
#define HDaccept(A, B, C) accept((A), (B), (C)) /* mirror VFD */
-#endif /* HDaccept */
+#endif /* HDaccept */
#ifndef HDaccess
#define HDaccess(F, M) access(F, M)
#endif /* HDaccess */
@@ -709,7 +709,7 @@ typedef struct {
#endif /* HDasin */
#ifndef HDasprintf
#define HDasprintf asprintf /*varargs*/
-#endif /* HDasprintf */
+#endif /* HDasprintf */
#ifndef HDassert
#define HDassert(X) assert(X)
#endif /* HDassert */
@@ -736,7 +736,7 @@ typedef struct {
#endif /* HDatol */
#ifndef HDbind
#define HDbind(A, B, C) bind((A), (B), (C)) /* mirror VFD */
-#endif /* HDbind */
+#endif /* HDbind */
#ifndef HDbsearch
#define HDbsearch(K, B, N, Z, F) bsearch(K, B, N, Z, F)
#endif /* HDbsearch */
@@ -784,7 +784,7 @@ typedef struct {
#endif /* HDclosedir */
#ifndef HDconnect
#define HDconnect(A, B, C) connect((A), (B), (C)) /* mirror VFD */
-#endif /* HDconnect */
+#endif /* HDconnect */
#ifndef HDcos
#define HDcos(X) cos(X)
#endif /* HDcos */
@@ -1033,7 +1033,7 @@ typedef off_t h5_stat_size_t;
#endif /* HDgetgroups */
#ifndef HDgethostbyaddr
#define HDgethostbyaddr(A, B, C) gethostbyaddr((A), (B), (C)) /* mirror VFD */
-#endif /* HDgethostbyaddr */
+#endif /* HDgethostbyaddr */
#ifndef HDgethostname
#define HDgethostname(N, L) gethostname(N, L)
#endif /* HDgethostname */
@@ -1075,55 +1075,55 @@ typedef off_t h5_stat_size_t;
#endif /* HDgmtime */
#ifndef HDhtonl
#define HDhtonl(X) htonl((X)) /* mirror VFD */
-#endif /* HDhtonl */
+#endif /* HDhtonl */
#ifndef HDhtons
#define HDhtons(X) htons((X)) /* mirror VFD */
-#endif /* HDhtons */
+#endif /* HDhtons */
#ifndef HDinet_addr
#define HDinet_addr(C) inet_addr((C)) /* mirror VFD */
-#endif /* HDinet_addr */
+#endif /* HDinet_addr */
#ifndef HDinet_ntoa
#define HDinet_ntoa(C) inet_ntoa((C)) /* mirror VFD */
-#endif /* HDinet_ntoa */
+#endif /* HDinet_ntoa */
#ifndef HDisalnum
#define HDisalnum(C) isalnum((int)(C)) /*cast for solaris warning*/
-#endif /* HDisalnum */
+#endif /* HDisalnum */
#ifndef HDisalpha
#define HDisalpha(C) isalpha((int)(C)) /*cast for solaris warning*/
-#endif /* HDisalpha */
+#endif /* HDisalpha */
#ifndef HDisatty
#define HDisatty(F) isatty(F)
#endif /* HDisatty */
#ifndef HDiscntrl
#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
-#endif /* HDiscntrl */
+#endif /* HDiscntrl */
#ifndef HDisdigit
#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
-#endif /* HDisdigit */
+#endif /* HDisdigit */
#ifndef HDisgraph
#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
-#endif /* HDisgraph */
+#endif /* HDisgraph */
#ifndef HDislower
#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
-#endif /* HDislower */
+#endif /* HDislower */
#ifndef HDisnan
#define HDisnan(X) isnan(X)
#endif /* HDisnan */
#ifndef HDisprint
#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
-#endif /* HDisprint */
+#endif /* HDisprint */
#ifndef HDispunct
#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
-#endif /* HDispunct */
+#endif /* HDispunct */
#ifndef HDisspace
#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
-#endif /* HDisspace */
+#endif /* HDisspace */
#ifndef HDisupper
#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
-#endif /* HDisupper */
+#endif /* HDisupper */
#ifndef HDisxdigit
#define HDisxdigit(C) isxdigit((int)(C)) /*cast for solaris warning*/
-#endif /* HDisxdigit */
+#endif /* HDisxdigit */
#ifndef HDkill
#define HDkill(P, S) kill(P, S)
#endif /* HDkill */
@@ -1141,7 +1141,7 @@ typedef off_t h5_stat_size_t;
#endif /* HDlink */
#ifndef HDlisten
#define HDlisten(A, B) listen((A), (B)) /* mirror VFD */
-#endif /* HDlisten */
+#endif /* HDlisten */
#ifndef HDllround
#define HDllround(V) llround(V)
#endif /* HDround */
@@ -1225,10 +1225,10 @@ typedef off_t h5_stat_size_t;
#endif /* HDnanosleep */
#ifndef HDntohl
#define HDntohl(A) ntohl((A)) /* mirror VFD */
-#endif /* HDntohl */
+#endif /* HDntohl */
#ifndef HDntohs
#define HDntohs(A) ntohs((A)) /* mirror VFD */
-#endif /* HDntohs */
+#endif /* HDntohs */
#ifndef HDopen
#define HDopen(F, ...) open(F, __VA_ARGS__)
#endif /* HDopen */
@@ -1300,7 +1300,7 @@ H5_DLL void HDsrand(unsigned int seed);
#ifndef HDsrandom
#define HDsrandom(S) srandom(S)
#endif /* HDsrandom */
-#else /* H5_HAVE_RANDOM */
+#else /* H5_HAVE_RANDOM */
#ifndef HDrand
#define HDrand() rand()
#endif /* HDrand */
@@ -1378,7 +1378,7 @@ H5_DLL void HDsrand(unsigned int seed);
#endif /* HDsetsid */
#ifndef HDsetsockopt
#define HDsetsockopt(A, B, C, D, E) setsockopt((A), (B), (C), (D), (E)) /* mirror VFD */
-#endif /* HDsetsockopt */
+#endif /* HDsetsockopt */
#ifndef HDsetuid
#define HDsetuid(U) setuid(U)
#endif /* HDsetuid */
@@ -1387,7 +1387,7 @@ H5_DLL void HDsrand(unsigned int seed);
#endif /* HDsetvbuf */
#ifndef HDshutdown
#define HDshutdown(A, B) shutdown((A), (B)) /* mirror VFD */
-#endif /* HDshutdown */
+#endif /* HDshutdown */
#ifndef HDsigaction
#define HDsigaction(S, A, O) sigaction((S), (A), (O))
#endif /* HDsigaction */
@@ -1435,13 +1435,13 @@ H5_DLL void HDsrand(unsigned int seed);
#endif /* HDsleep */
#ifndef HDsnprintf
#define HDsnprintf snprintf /*varargs*/
-#endif /* HDsnprintf */
+#endif /* HDsnprintf */
#ifndef HDsocket
#define HDsocket(A, B, C) socket((A), (B), (C)) /* mirror VFD */
-#endif /* HDsocket */
+#endif /* HDsocket */
#ifndef HDsprintf
#define HDsprintf sprintf /*varargs*/
-#endif /* HDsprintf */
+#endif /* HDsprintf */
#ifndef HDsqrt
#define HDsqrt(X) sqrt(X)
#endif /* HDsqrt */
@@ -1655,7 +1655,7 @@ H5_DLL int64_t HDstrtoll(const char *s, const char **rest, int base);
* define these in terms of macros.
*/
#if !defined strdup && !defined H5_HAVE_STRDUP
-extern char *strdup(const char *s);
+extern char * strdup(const char *s);
#endif
#ifndef HDstrdup
@@ -1941,7 +1941,7 @@ extern char H5libhdf5_settings[]; /* embedded library information */
#define H5TRACE11(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10) /*void*/
#define H5TRACE12(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) /*void*/
#define H5TRACE_RETURN(V) /*void*/
-#endif /* H5_DEBUG_API */
+#endif /* H5_DEBUG_API */
H5_DLL double H5_trace(const double *calltime, const char *func, const char *type, ...);
@@ -2071,10 +2071,10 @@ extern hbool_t H5_libterm_g; /* Is the library being shutdown? */
#define H5_PUSH_FUNC H5CS_push(FUNC);
#define H5_POP_FUNC H5CS_pop();
-#else /* H5_HAVE_CODESTACK */
+#else /* H5_HAVE_CODESTACK */
#define H5_PUSH_FUNC /* void */
#define H5_POP_FUNC /* void */
-#endif /* H5_HAVE_CODESTACK */
+#endif /* H5_HAVE_CODESTACK */
#ifdef H5_HAVE_MPE
extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
@@ -2127,7 +2127,7 @@ H5_DLL herr_t H5CX_pop(void);
func_check = TRUE; \
} /* end if */ \
} /* end scope */
-#else /* NDEBUG */
+#else /* NDEBUG */
#define FUNC_ENTER_CHECK_NAME(asrt)
#endif /* NDEBUG */
diff --git a/src/H5public.h b/src/H5public.h
index 9e31cbe..940e5b2 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 12 /* For minor interface/format changes */
-#define H5_VERS_RELEASE 1 /* For tweaks, bug-fixes, or development */
-#define H5_VERS_SUBRELEASE "4" /* For pre-releases like snap0 */
- /* Empty string for real releases. */
+#define H5_VERS_MAJOR 1 /* For major interface/format changes */
+#define H5_VERS_MINOR 12 /* For minor interface/format changes */
+#define H5_VERS_RELEASE 1 /* For tweaks, bug-fixes, or development */
+#define H5_VERS_SUBRELEASE "4" /* For pre-releases like snap0 */
+/* Empty string for real releases. */
#define H5_VERS_INFO "HDF5 library version: 1.12.1-4" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE)
@@ -176,15 +176,15 @@ typedef long long ssize_t;
*/
#if H5_SIZEOF_INT64_T >= 8
#elif H5_SIZEOF_INT >= 8
-typedef int int64_t;
+typedef int int64_t;
#undef H5_SIZEOF_INT64_T
#define H5_SIZEOF_INT64_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG >= 8
-typedef long int64_t;
+typedef long int64_t;
#undef H5_SIZEOF_INT64_T
#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
#elif H5_SIZEOF_LONG_LONG >= 8
-typedef long long int64_t;
+typedef long long int64_t;
#undef H5_SIZEOF_INT64_T
#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
#else
@@ -199,12 +199,12 @@ typedef long long int64_t;
#define UINT64_MAX ((uint64_t)-1)
#endif
#elif H5_SIZEOF_INT >= 8
-typedef unsigned uint64_t;
+typedef unsigned uint64_t;
#define UINT64_MAX UINT_MAX
#undef H5_SIZEOF_UINT64_T
#define H5_SIZEOF_UINT64_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG >= 8
-typedef unsigned long uint64_t;
+typedef unsigned long uint64_t;
#define UINT64_MAX ULONG_MAX
#undef H5_SIZEOF_UINT64_T
#define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
@@ -289,15 +289,15 @@ typedef unsigned long long haddr_t;
*/
#if H5_SIZEOF_UINT32_T >= 4
#elif H5_SIZEOF_SHORT >= 4
-typedef short uint32_t;
+typedef short uint32_t;
#undef H5_SIZEOF_UINT32_T
#define H5_SIZEOF_UINT32_T H5_SIZEOF_SHORT
#elif H5_SIZEOF_INT >= 4
-typedef unsigned int uint32_t;
+typedef unsigned int uint32_t;
#undef H5_SIZEOF_UINT32_T
#define H5_SIZEOF_UINT32_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG >= 4
-typedef unsigned long uint32_t;
+typedef unsigned long uint32_t;
#undef H5_SIZEOF_UINT32_T
#define H5_SIZEOF_UINT32_T H5_SIZEOF_LONG
#else
diff --git a/src/H5system.c b/src/H5system.c
index fdc6c22..4026752 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -347,7 +347,7 @@ H5_make_time(struct tm *tm)
* VS 2015 is removed, with _get_timezone replacing it.
*/
long timezone = 0;
-#endif /* defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900) */
+#endif /* defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900) */
time_t ret_value = 0; /* Return value */
FUNC_ENTER_NOAPI_NOINIT
diff --git a/src/H5timer.c b/src/H5timer.c
index b637a16..b53c302 100644
--- a/src/H5timer.c
+++ b/src/H5timer.c
@@ -164,7 +164,7 @@ H5_now(void)
HDgettimeofday(&now_tv, NULL);
now = now_tv.tv_sec;
}
-#else /* H5_HAVE_GETTIMEOFDAY */
+#else /* H5_HAVE_GETTIMEOFDAY */
now = HDtime(NULL);
#endif /* H5_HAVE_GETTIMEOFDAY */
@@ -202,8 +202,8 @@ H5_now_usec(void)
HDgettimeofday(&now_tv, NULL);
now = (uint64_t)(now_tv.tv_sec * (1000 * 1000)) + (uint64_t)now_tv.tv_usec;
}
-#else /* H5_HAVE_GETTIMEOFDAY */
- now = (uint64_t)(HDtime(NULL) * (1000 * 1000));
+#else /* H5_HAVE_GETTIMEOFDAY */
+ now = (uint64_t)(HDtime(NULL) * (1000 * 1000));
#endif /* H5_HAVE_GETTIMEOFDAY */
return (now);
diff --git a/test/accum.c b/test/accum.c
index 46015c9..0b9fbad 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -2101,7 +2101,7 @@ test_swmr_write_big(hbool_t newest_format)
unsigned u; /* Local index variable */
#ifdef H5_HAVE_UNISTD_H
pid_t pid; /* Process ID */
-#endif /* H5_HAVE_UNISTD_H */
+#endif /* H5_HAVE_UNISTD_H */
int status; /* Status returned from child process */
char * driver = NULL; /* VFD string (from env variable) */
hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */
diff --git a/test/btree2.c b/test/btree2.c
index 919a6ee..42f9a61 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -2690,7 +2690,7 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
record = 2862; /* Record to left of insertion point in right internal node (now) */
if (check_node_depth(bt2, &record, (unsigned)1) < 0)
TEST_ERROR
-#endif /* NONE */
+#endif /* NONE */
record = 3137; /* Record to right of insertion point in right internal node (now) */
if (check_node_depth(bt2, &record, (unsigned)1) < 0)
TEST_ERROR
@@ -2871,7 +2871,7 @@ test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam, cons
record = 3049; /* Record to left of insertion point in middle internal node */
if (check_node_depth(bt2, &record, (unsigned)1) < 0)
TEST_ERROR
-#endif /* NONE */
+#endif /* NONE */
record = 2822; /* Record to right of insertion point in middle internal node */
if (check_node_depth(bt2, &record, (unsigned)1) < 0)
TEST_ERROR
diff --git a/test/cache.c b/test/cache.c
index 0e923fd..b7269ba 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -4449,7 +4449,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int
test_entry_t *base_addr;
test_entry_t *entry_ptr;
-#if 0 /* JRM */
+#if 0 /* JRM */
/* This gets used a lot, so lets leave it in. */
HDfprintf(stdout, "check_flush_cache__multi_entry_test: test %d\n",
@@ -4637,7 +4637,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i
test_entry_t *base_addr;
test_entry_t *entry_ptr;
-#if 0 /* JRM */
+#if 0 /* JRM */
/* This is useful debugging code. Leave it in for now. */
HDfprintf(stdout, "check_flush_cache__pe_multi_entry_test: test %d\n",
@@ -33871,7 +33871,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr)
pass = FALSE;
failure_mssg = "unexpected scan restart stats in cedds__expunge_dirty_entry_in_flush_test().";
} /* end if */
-#endif /* H5C_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
if (pass)
reset_entries();
@@ -35232,7 +35232,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr)
pass = FALSE;
failure_mssg = "Unexpected monster entry level stats in check_stats__smoke_check_1(1).";
} /* end if */
-#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
if (pass)
/* protect and unprotect each entry once. Note
@@ -35306,7 +35306,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr)
pass = FALSE;
failure_mssg = "Unexpected monster entry level stats in check_stats__smoke_check_1(2).";
} /* end if */
-#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
if (pass) {
/* protect and unprotect an entry that is not currently
diff --git a/test/cache_common.h b/test/cache_common.h
index 87fab72..aa32858 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -392,7 +392,8 @@ typedef struct test_entry_t {
int flush_dep_par_idx[MAX_FLUSH_DEP_PARS]; /* Indices of flush dependency parents */
unsigned flush_dep_npar; /* Number of flush dependency parents */
unsigned flush_dep_nchd; /* Number of flush dependency children */
- unsigned flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including granchildren, etc.) */
+ unsigned
+ flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including granchildren, etc.) */
hbool_t pinned_from_client; /* entry was pinned by client call */
hbool_t pinned_from_cache; /* entry was pinned by cache internally */
unsigned flush_order; /* Order that entry was flushed in */
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index 9d0aa3e..97c9e84 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -444,7 +444,7 @@ check_file_creation_tags(hid_t fcpl_id, int type)
hid_t fid = -1; /* File Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose test outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
haddr_t sbe_tag = 0;
@@ -548,7 +548,7 @@ check_file_open_tags(hid_t fcpl, int type)
hid_t fid = -1; /* File Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag; /* Root Group Tag */
haddr_t sbe_tag; /* Sblock Extension Tag */
@@ -678,7 +678,7 @@ check_group_creation_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF; /* Root Group Tag */
haddr_t g_tag; /* Group Tag */
@@ -801,7 +801,7 @@ check_multi_group_creation_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
char gname[16]; /* group name buffer */
int i = 0; /* iterator */
hid_t fapl = -1; /* File access prop list */
@@ -953,7 +953,7 @@ check_link_iteration_tags(void)
hid_t did = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
int i = 0; /* iterator */
haddr_t root_tag = 0; /* Root Group Tag Value */
char dsetname[500]; /* Name of dataset */
@@ -1095,7 +1095,7 @@ check_dense_attribute_tags(void)
hid_t dcpl = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
int i = 0; /* iterator */
hid_t fapl = -1; /* File access property list */
haddr_t d_tag = 0; /* Dataset tag value */
@@ -1325,7 +1325,7 @@ check_group_open_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file output */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF;
haddr_t g_tag;
@@ -1456,7 +1456,7 @@ check_attribute_creation_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0; /* Root group tag */
haddr_t g_tag = 0;
@@ -1621,7 +1621,7 @@ check_attribute_open_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
haddr_t g_tag = 0;
@@ -1788,7 +1788,7 @@ check_attribute_rename_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataset Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
int * data = NULL; /* data buffer */
int i, j, k = 0; /* iterators */
hid_t fapl = -1; /* File access prop list */
@@ -2001,7 +2001,7 @@ check_attribute_delete_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataset Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
int * data = NULL; /* data buffer */
int i, j, k = 0; /* iterators */
hid_t fapl = -1; /* File access prop list */
@@ -2192,7 +2192,7 @@ check_dataset_creation_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2352,7 +2352,7 @@ check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2518,7 +2518,7 @@ check_dataset_open_tags(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2670,7 +2670,7 @@ check_dataset_write_tags(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2837,7 +2837,7 @@ check_attribute_write_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataset Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
int * data = NULL; /* data buffer */
int i, j, k = 0; /* iterators */
hid_t fapl = -1; /* File access prop list */
@@ -3023,7 +3023,7 @@ check_dataset_read_tags(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3185,7 +3185,7 @@ check_dataset_size_retrieval(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3349,7 +3349,7 @@ check_dataset_extend_tags(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3511,7 +3511,7 @@ check_object_info_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file output */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF;
haddr_t g_tag;
@@ -3646,7 +3646,7 @@ check_object_copy_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file output */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF;
haddr_t g_tag;
@@ -3796,7 +3796,7 @@ check_link_removal_tags(hid_t fcpl, int type)
hid_t gid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3985,7 +3985,7 @@ check_link_getname_tags(void)
hid_t gid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -4162,7 +4162,7 @@ check_external_link_creation_tags(void)
hid_t gid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
@@ -4289,7 +4289,7 @@ check_external_link_open_tags(void)
hid_t xid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
H5O_native_info_t ninfo; /* Native object info struct */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
@@ -4462,7 +4462,7 @@ check_invalid_tag_application(void)
H5HL_t *lheap = NULL;
hid_t fapl = -1; /* File access prop list */
hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */
-#endif /* H5C_DO_TAGGING_SANITY_CHECKS */
+#endif /* H5C_DO_TAGGING_SANITY_CHECKS */
/* Testing Macro */
TESTING("failure on invalid tag application");
diff --git a/test/chunk_info.c b/test/chunk_info.c
index d45e923..cc35bfe 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -489,7 +489,7 @@ test_get_chunk_info_highest_v18(hid_t fapl)
Bytef * z_dst; /*destination buffer */
uLongf z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(CHK_SIZE);
uLong z_src_nbytes = (uLong)CHK_SIZE;
-#endif /* end H5_HAVE_FILTER_DEFLATE */
+#endif /* end H5_HAVE_FILTER_DEFLATE */
void * inbuf = NULL; /* Pointer to new buffer */
hsize_t chunk_size = CHK_SIZE; /* Size of a chunk, can be compressed or not */
hsize_t ii, jj; /* Array indices */
diff --git a/test/cross_read.c b/test/cross_read.c
index 7455752..22c6828 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -275,7 +275,7 @@ check_file(char *filename)
TESTING("dataset of LE FLOAT with Deflate filter");
#ifdef H5_HAVE_FILTER_DEFLATE
nerrors += check_data_f(DATASETNAME16, fid);
-#else /*H5_HAVE_FILTER_DEFLATE*/
+#else /*H5_HAVE_FILTER_DEFLATE*/
SKIPPED();
HDputs(not_supported);
#endif /*H5_HAVE_FILTER_DEFLATE*/
@@ -283,7 +283,7 @@ check_file(char *filename)
TESTING("dataset of BE FLOAT with Deflate filter");
#ifdef H5_HAVE_FILTER_DEFLATE
nerrors += check_data_f(DATASETNAME17, fid);
-#else /*H5_HAVE_FILTER_DEFLATE*/
+#else /*H5_HAVE_FILTER_DEFLATE*/
SKIPPED();
HDputs(not_supported);
#endif /*H5_HAVE_FILTER_DEFLATE*/
@@ -291,7 +291,7 @@ check_file(char *filename)
TESTING("dataset of LE FLOAT with Szip filter");
#ifdef H5_HAVE_FILTER_SZIP
nerrors += check_data_f(DATASETNAME18, fid);
-#else /*H5_HAVE_FILTER_SZIP*/
+#else /*H5_HAVE_FILTER_SZIP*/
SKIPPED();
HDputs(not_supported);
#endif /*H5_HAVE_FILTER_SZIP*/
@@ -299,7 +299,7 @@ check_file(char *filename)
TESTING("dataset of BE FLOAT with Szip filter");
#ifdef H5_HAVE_FILTER_SZIP
nerrors += check_data_f(DATASETNAME19, fid);
-#else /*H5_HAVE_FILTER_SZIP*/
+#else /*H5_HAVE_FILTER_SZIP*/
SKIPPED();
HDputs(not_supported);
#endif /*H5_HAVE_FILTER_SZIP*/
diff --git a/test/dsets.c b/test/dsets.c
index 2e9e3db..a7b67ef 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -2412,7 +2412,7 @@ test_get_filter_info(void)
if (((flags & H5Z_FILTER_CONFIG_ENCODE_ENABLED) != 0) ||
((flags & H5Z_FILTER_CONFIG_DECODE_ENABLED) == 0))
TEST_ERROR
- } /* end else */
+ } /* end else */
#endif /* H5_HAVE_FILTER_SZIP */
/* Verify that get_filter_info throws an error when given a bad filter */
@@ -2454,7 +2454,7 @@ test_filters(hid_t file, hid_t
#ifdef H5_HAVE_FILTER_DEFLATE
hsize_t deflate_size; /* Size of dataset with deflate filter */
-#endif /* H5_HAVE_FILTER_DEFLATE */
+#endif /* H5_HAVE_FILTER_DEFLATE */
#ifdef H5_HAVE_FILTER_SZIP
hsize_t szip_size; /* Size of dataset with szip filter */
@@ -2466,7 +2466,7 @@ test_filters(hid_t file, hid_t
#if defined(H5_HAVE_FILTER_DEFLATE) || defined(H5_HAVE_FILTER_SZIP)
hsize_t combo_size; /* Size of dataset with multiple filters */
-#endif /* defined(H5_HAVE_FILTER_DEFLATE) || defined(H5_HAVE_FILTER_SZIP) */
+#endif /* defined(H5_HAVE_FILTER_DEFLATE) || defined(H5_HAVE_FILTER_SZIP) */
/* test the H5Zget_filter_info function */
if (test_get_filter_info() < 0)
@@ -2569,7 +2569,7 @@ test_filters(hid_t file, hid_t
/* Clean up objects used for this test */
if (H5Pclose(dc) < 0)
goto error;
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
TESTING("deflate filter");
SKIPPED();
HDputs(" Deflate filter not enabled");
@@ -2611,7 +2611,7 @@ test_filters(hid_t file, hid_t
SKIPPED();
}
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
TESTING("szip filter");
SKIPPED();
HDputs(" Szip filter not enabled");
@@ -2686,7 +2686,7 @@ test_filters(hid_t file, hid_t
/* Clean up objects used for this test */
if (H5Pclose(dc) < 0)
goto error;
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
TESTING("shuffle+deflate+fletcher32 filters");
SKIPPED();
HDputs(" Deflate filter not enabled");
@@ -2764,7 +2764,7 @@ test_filters(hid_t file, hid_t
SKIPPED();
}
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
TESTING("shuffle+szip+fletcher32 filters");
SKIPPED();
HDputs(" szip filter not enabled");
@@ -2820,7 +2820,7 @@ test_missing_filter(hid_t file)
H5_FAILED();
HDprintf(" Line %d: Can't unregister deflate filter\n", __LINE__);
goto error;
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_FILTER_DEFLATE */
/* Verify deflate filter is not registered currently */
if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != FALSE) {
@@ -3006,7 +3006,7 @@ test_missing_filter(hid_t file)
H5_FAILED();
HDprintf(" Line %d: Deflate filter not available\n", __LINE__);
goto error;
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_FILTER_DEFLATE */
/* Pop API context */
@@ -6257,7 +6257,7 @@ test_can_apply_szip(hid_t
const hsize_t chunk_dims[2] = {250, 2048}; /* Chunk dimensions */
const hsize_t chunk_dims2[2] = {2, 1}; /* Chunk dimensions */
herr_t ret; /* Status value */
-#endif /* H5_HAVE_FILTER_SZIP */
+#endif /* H5_HAVE_FILTER_SZIP */
TESTING("dataset szip filter 'can apply' callback");
@@ -6409,7 +6409,7 @@ test_can_apply_szip(hid_t
SKIPPED();
HDputs(" Szip encoding is not enabled.");
}
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
SKIPPED();
HDputs(" Szip filter is not enabled.");
#endif /* H5_HAVE_FILTER_SZIP */
@@ -10668,7 +10668,7 @@ test_fixed_array(hid_t fapl)
#ifdef H5_HAVE_FILTER_DEFLATE
unsigned compress; /* Whether chunks should be compressed */
-#endif /* H5_HAVE_FILTER_DEFLATE */
+#endif /* H5_HAVE_FILTER_DEFLATE */
h5_stat_size_t empty_size; /* Size of an empty file */
h5_stat_size_t file_size; /* Size of each file created */
@@ -11087,7 +11087,7 @@ test_fixed_array(hid_t fapl)
} /* end for */
#ifdef H5_HAVE_FILTER_DEFLATE
- } /* end for */
+ } /* end for */
#endif /* H5_HAVE_FILTER_DEFLATE */
/* Release buffers */
@@ -11179,7 +11179,7 @@ test_single_chunk(hid_t fapl)
#ifdef H5_HAVE_FILTER_DEFLATE
unsigned compress; /* Whether chunks should be compressed */
-#endif /* H5_HAVE_FILTER_DEFLATE */
+#endif /* H5_HAVE_FILTER_DEFLATE */
size_t n, i; /* local index variables */
herr_t ret; /* Generic return value */
@@ -11391,7 +11391,7 @@ test_single_chunk(hid_t fapl)
} /* end for */
#ifdef H5_HAVE_FILTER_DEFLATE
- } /* end for */
+ } /* end for */
#endif /* H5_HAVE_FILTER_DEFLATE */
/* Release buffers */
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 49c1e8c..7b2274c 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -5165,7 +5165,7 @@ run_int_fp_conv(const char *name)
#if H5_SIZEOF_LONG_LONG != H5_SIZEOF_LONG
#if H5_LLONG_TO_LDOUBLE_CORRECT
nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_LLONG, H5T_NATIVE_LDOUBLE);
-#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
+#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
{
char str[256]; /*hello string */
@@ -5177,7 +5177,7 @@ run_int_fp_conv(const char *name)
#endif /* H5_LLONG_TO_LDOUBLE_CORRECT */
#if H5_LLONG_TO_LDOUBLE_CORRECT
nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_ULLONG, H5T_NATIVE_LDOUBLE);
-#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
+#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
{
char str[256]; /*hello string */
diff --git a/test/dtypes.c b/test/dtypes.c
index e973f92..13cf6e8 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -6486,7 +6486,7 @@ test_int_float_except(void)
hid_t dxpl; /* Dataset transfer property list */
except_info_t e; /* Exception information */
unsigned u; /* Local index variables */
-#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
+#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
TESTING("exceptions for int <-> float conversions");
@@ -6602,7 +6602,7 @@ test_int_float_except(void)
TEST_ERROR
PASSED();
-#else /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
+#else /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
SKIPPED();
HDputs(" Test skipped due to int or float not 4 bytes.");
#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
diff --git a/test/earray.c b/test/earray.c
index 21db0d8..4ef79ee 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -375,7 +375,7 @@ check_stats(const H5EA_t *ea, const earray_state_t *state)
"\n",
earray_stats.stored.data_blk_size, state->data_blk_size);
TEST_ERROR
- } /* end if */
+ } /* end if */
#endif /* NOT_YET */
if (earray_stats.stored.nsuper_blks != state->nsuper_blks) {
HDfprintf(stdout,
@@ -391,7 +391,7 @@ check_stats(const H5EA_t *ea, const earray_state_t *state)
"\n",
earray_stats.stored.super_blk_size, state->super_blk_size);
TEST_ERROR
- } /* end if */
+ } /* end if */
#endif /* NOT_YET */
/* All tests passed */
@@ -757,7 +757,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
PASSED();
}
-#else /* NDEBUG */
+#else /* NDEBUG */
SKIPPED();
HDputs(" Not tested when assertions are disabled");
#endif /* NDEBUG */
diff --git a/test/error_test.c b/test/error_test.c
index a47fa85..4fa7bc9 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -132,7 +132,7 @@ test_error(hid_t file)
#ifdef H5_USE_16_API
if (old_func != (H5E_auto_t)H5Eprint)
TEST_ERROR;
-#else /* H5_USE_16_API */
+#else /* H5_USE_16_API */
if (old_func != (H5E_auto2_t)H5Eprint2)
TEST_ERROR;
#endif /* H5_USE_16_API */
diff --git a/test/farray.c b/test/farray.c
index 5758a3f..46889a3 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -481,7 +481,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
PASSED();
}
-#else /* NDEBUG */
+#else /* NDEBUG */
SKIPPED();
HDputs(" Not tested when assertions are disabled");
#endif /* NDEBUG */
diff --git a/test/fheap.c b/test/fheap.c
index f8f9d16..33f7110 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -9423,13 +9423,14 @@ test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
- unsigned row; /* Current row in indirect block */
- h5_stat_size_t empty_size; /* Size of a file with an empty heap */
- size_t obj_size; /* Size of object */
- size_t fill_size; /* Size of objects for "bulk" filled blocks */
- fheap_heap_state_t state; /* State of fractal heap */
- unsigned u; /* Local index variable */
+ unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the */
+ /* first indirect blocks */
+ unsigned row; /* Current row in indirect block */
+ h5_stat_size_t empty_size; /* Size of a file with an empty heap */
+ size_t obj_size; /* Size of object */
+ size_t fill_size; /* Size of objects for "bulk" filled blocks */
+ fheap_heap_state_t state; /* State of fractal heap */
+ unsigned u; /* Local index variable */
/* Test description */
const char *base_desc = "filling direct blocks and skipping row of non-root indirect blocks, then "
"backfill and extend, then remove all objects %s";
@@ -9554,7 +9555,8 @@ test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -9699,8 +9701,9 @@ test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(hid_t fapl, H5
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
- unsigned row; /* Current row in indirect block */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned row; /* Current row in indirect block */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -9861,7 +9864,8 @@ test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
unsigned max_dblock_rows; /* Max. # of rows (of direct blocks) in the root indirect block */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
@@ -10016,7 +10020,8 @@ test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
unsigned max_dblock_rows; /* Max. # of rows (of direct blocks) in the root indirect block */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
@@ -10472,7 +10477,8 @@ test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(h
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -10624,7 +10630,8 @@ test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -10780,7 +10787,8 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -10943,7 +10951,8 @@ test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_s
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11110,7 +11119,8 @@ test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(hid_t fapl, H5
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11272,7 +11282,8 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_blo
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11454,7 +11465,8 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11673,7 +11685,8 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11872,7 +11885,8 @@ test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -12402,7 +12416,8 @@ test_man_frag_2nd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -14937,7 +14952,7 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
#ifdef NOT_YET
h5_stat_size_t file_size; /* Size of file currently */
-#endif /* NOT_YET */
+#endif /* NOT_YET */
unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */
size_t obj_size; /* Size of object */
size_t robj_size; /* Size of object read */
@@ -15110,7 +15125,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
#ifdef NOT_YET
h5_stat_size_t file_size; /* Size of file currently */
-#endif /* NOT_YET */
+#endif /* NOT_YET */
unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for object #1 */
unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for object #2 */
size_t obj_size; /* Size of object */
diff --git a/test/filter_plugin.c b/test/filter_plugin.c
index cf2272c..7956ab3 100644
--- a/test/filter_plugin.c
+++ b/test/filter_plugin.c
@@ -463,7 +463,7 @@ test_dataset_write_with_filters(hid_t fid)
/* Clean up objects used for this test */
if (H5Pclose(dcpl_id) < 0)
TEST_ERROR;
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
SKIPPED();
HDputs(" Deflate filter not enabled");
#endif /* H5_HAVE_FILTER_DEFLATE */
@@ -649,7 +649,7 @@ test_dataset_read_with_filters(hid_t fid)
if (H5Dclose(did) < 0)
TEST_ERROR;
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
SKIPPED();
HDputs(" Deflate filter not enabled");
#endif /* H5_HAVE_FILTER_DEFLATE */
diff --git a/test/gen_bad_ohdr.c b/test/gen_bad_ohdr.c
index 641beac..ca635a1 100644
--- a/test/gen_bad_ohdr.c
+++ b/test/gen_bad_ohdr.c
@@ -112,7 +112,7 @@ error:
H5Fclose(fid);
}
H5E_END_TRY;
-#else /* H5O_ENABLE_BAD_MESG_COUNT */
+#else /* H5O_ENABLE_BAD_MESG_COUNT */
HDputs("H5O_BAD_MESG_COUNT compiler macro not defined!");
#endif /* H5O_ENABLE_BAD_MESG_COUNT */
return 1;
diff --git a/test/gen_bogus.c b/test/gen_bogus.c
index ad85898..b21adeb 100644
--- a/test/gen_bogus.c
+++ b/test/gen_bogus.c
@@ -179,7 +179,7 @@ error:
H5Fclose(fid);
}
H5E_END_TRY;
-#else /* H5O_ENABLE_BOGUS */
+#else /* H5O_ENABLE_BOGUS */
HDputs("H5O_ENABLE_BOGUS compiler macro not defined!");
#endif /* H5O_ENABLE_BOGUS */
return 1;
diff --git a/test/gen_cross.c b/test/gen_cross.c
index 28ddf54..030cc65 100644
--- a/test/gen_cross.c
+++ b/test/gen_cross.c
@@ -925,7 +925,7 @@ create_deflate_dsets_float(hid_t fid, hid_t fsid, hid_t msid)
if (H5Pclose(dcpl) < 0)
TEST_ERROR
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
const char *not_supported = "Deflate filter is not enabled. Can't create the dataset.";
HDputs(not_supported);
@@ -1328,7 +1328,7 @@ main(void)
/* Create a dataset of FLOAT with szip filter */
if (create_szip_dsets_float(file, filespace, memspace) < 0)
TEST_ERROR;
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
HDputs("Szip filter is not enabled. Can't create the dataset.");
#endif /* H5_HAVE_FILTER_SZIP */
diff --git a/test/h5test.c b/test/h5test.c
index 7a4bf2d..1831418 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -2040,7 +2040,7 @@ h5_get_dummy_vol_class(void)
* can be registered.
*/
vol_class->version = H5VL_VERSION;
- vol_class->name = "dummy";
+ vol_class->name = "dummy";
return vol_class;
diff --git a/test/hdfs.c b/test/hdfs.c
index a59cdb6..4121f15 100644
--- a/test/hdfs.c
+++ b/test/hdfs.c
@@ -566,7 +566,8 @@ test_fapl_config_validation(void)
JSVERIFY(config.stream_buffer_size, fa_fetch.stream_buffer_size, "streambuffer size mismatch")
JSVERIFY_STR(config.namenode_name, fa_fetch.namenode_name, "node name mismatch")
JSVERIFY_STR(config.user_name, fa_fetch.user_name, "user name mismatch")
- JSVERIFY_STR(config.kerberos_ticket_cache, fa_fetch.kerberos_ticket_cache, "kerberos ticket cache mismatch")
+ JSVERIFY_STR(config.kerberos_ticket_cache, fa_fetch.kerberos_ticket_cache,
+ "kerberos ticket cache mismatch")
}
/*-----------------------------
diff --git a/test/links.c b/test/links.c
index 055e1dc..f0932dc 100644
--- a/test/links.c
+++ b/test/links.c
@@ -12316,7 +12316,7 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
char * tmpname = NULL;
char * cwdpath = NULL;
hbool_t have_posix_compat_vfd; /* Whether VFD used is compatible w/POSIX I/O calls */
-#endif /* H5_HAVE_SYMLINK */
+#endif /* H5_HAVE_SYMLINK */
if (new_format)
TESTING("external links w/symlink files (w/new group format)")
@@ -12570,7 +12570,7 @@ error:
return FAIL;
-#else /* H5_HAVE_SYMLINK */
+#else /* H5_HAVE_SYMLINK */
SKIPPED();
HDputs(" Current file system or operating system doesn't support symbolic links");
@@ -19183,7 +19183,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u
hsize_t skip; /* # of links to skip in group */
#ifndef H5_NO_DEPRECATED_SYMBOLS
int gskip; /* # of links to skip in group, with H5Giterate */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
herr_t ret; /* Generic return value */
/* Iterate over links in group */
@@ -19291,7 +19291,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u
if (nvisit != (max_links / 2))
TEST_ERROR
- } /* end else */
+ } /* end else */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Iterate over links in group, stopping in the middle */
@@ -19671,7 +19671,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
hsize_t skip; /* # of links to skip in group */
#ifndef H5_NO_DEPRECATED_SYMBOLS
int gskip; /* # of links to skip in group, with H5Giterate */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
herr_t ret; /* Generic return value */
/* Iterate over links in group */
@@ -19779,7 +19779,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
if (nvisit != (max_links / 2))
TEST_ERROR
- } /* end else */
+ } /* end else */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Iterate over links in group, stopping in the middle */
@@ -22502,12 +22502,12 @@ main(void)
nerrors += ud_hard_links(fapl2) < 0 ? 1 : 0; /* requires new format groups */
#ifndef H5_NO_DEPRECATED_SYMBOLS
nerrors += ud_hard_links_deprec(fapl2) < 0 ? 1 : 0; /* requires new format groups */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
nerrors += ud_link_reregister(fapl2) < 0 ? 1 : 0; /* requires new format groups */
#ifndef H5_NO_DEPRECATED_SYMBOLS
nerrors += ud_link_reregister_deprec(fapl2) < 0 ? 1 : 0; /* requires new format groups */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ } /* end if */
nerrors += ud_callbacks(my_fapl, new_format) < 0 ? 1 : 0;
#ifndef H5_NO_DEPRECATED_SYMBOLS
nerrors += ud_callbacks_deprec(my_fapl, new_format) < 0 ? 1 : 0;
diff --git a/test/mount.c b/test/mount.c
index 5d345a8..395a19a 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -1194,7 +1194,7 @@ test_interlink(hid_t fapl)
FAIL_STACK_ERROR
if (H5Tclose(type) < 0)
FAIL_STACK_ERROR
-#else /* NOT_NOW */
+#else /* NOT_NOW */
SKIPPED();
HDputs(" Test skipped due file pointer sharing issue (Jira 7638).");
#endif /* NOT_NOW */
diff --git a/test/objcopy.c b/test/objcopy.c
index 31744af..876e7de 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -4495,7 +4495,7 @@ test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid
#ifndef H5_HAVE_FILTER_DEFLATE
SKIPPED();
HDputs(" Deflation filter not available");
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
/* set initial data values */
for (i = 0; i < DIM_SIZE_1; i++)
for (j = 0; j < DIM_SIZE_2; j++)
@@ -4920,7 +4920,7 @@ test_copy_dataset_no_edge_filt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h
#ifndef H5_HAVE_FILTER_DEFLATE
SKIPPED();
HDputs(" Deflation filter not available");
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
/* set initial data values */
for (i = 0; i < DIM_SIZE_1; i++)
for (j = 0; j < DIM_SIZE_2; j++)
@@ -7274,7 +7274,7 @@ test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
#ifndef H5_HAVE_FILTER_DEFLATE
SKIPPED();
HDputs(" Deflation filter not available");
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
/* set initial data values */
for (i = 0; i < DIM_SIZE_1; i++) {
for (j = 0; j < DIM_SIZE_2; j++) {
diff --git a/test/s3comms.c b/test/s3comms.c
index f3e96b5..c6173fd 100644
--- a/test/s3comms.c
+++ b/test/s3comms.c
@@ -291,7 +291,7 @@ jserr_str(const char *expected, const char *actual, const char *reason)
if ((long)(actual) == (long)(expected)) { \
JSERR_LONG((expected), (actual), (reason)) \
goto error; \
- } /* JSVERIFY_NOT */
+ } /* JSVERIFY_NOT */
#endif /* JSVERIFY_NOT unused */
/*----------------------------------------------------------------------------
@@ -348,7 +348,7 @@ jserr_str(const char *expected, const char *actual, const char *reason)
if ((long)(actual) == (long)(expected)) { \
JSERR_LONG((expected), (actual), (reason)) \
goto error; \
- } /* JSVERIFY_NOT */
+ } /* JSVERIFY_NOT */
#endif /* JSVERIFY_NOT unused */
/*----------------------------------------------------------------------------
@@ -1290,7 +1290,7 @@ test_HMAC_SHA256(void)
HDfprintf(stdout, "ERROR:\n!!! \"%s\"\n != \"%s\"\n", cases[i].exp, dest);
TEST_ERROR;
}
-#else /* VERBOSE not defined */
+#else /* VERBOSE not defined */
/* simple pass/fail test
*/
JSVERIFY(0, HDstrncmp(cases[i].exp, dest, HDstrlen(cases[i].exp)), NULL);
diff --git a/test/set_extent.c b/test/set_extent.c
index 672d5ff..2ad4fd5 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -243,11 +243,11 @@ do_ranks(hid_t fapl, hbool_t new_format)
#ifdef H5_HAVE_FILTER_DEFLATE
if (H5Pset_deflate(dcpl, 9) < 0)
TEST_ERROR
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
if (H5Pclose(dcpl) < 0)
TEST_ERROR
continue;
-#endif /* H5_HAVE_FILTER_DEFLATE */
+#endif /* H5_HAVE_FILTER_DEFLATE */
} /* end if */
if (config & CONFIG_FILL) {
diff --git a/test/stab.c b/test/stab.c
index e68c000..739a1ba 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -1271,7 +1271,7 @@ old_api(hid_t fapl)
TEST_ERROR
PASSED();
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
/* Shut compiler up */
fapl = fapl;
diff --git a/test/swmr.c b/test/swmr.c
index ded0115..61d312b 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -2351,7 +2351,7 @@ test_start_swmr_write_concur(hid_t H5_ATTR_UNUSED in_fapl, hbool_t H5_ATTR_UNUSE
return 0;
} /* test_start_swmr_write_concur() */
-#else /* defined(H5_HAVE_FORK && defined(H5_HAVE_WAITPID) */
+#else /* defined(H5_HAVE_FORK && defined(H5_HAVE_WAITPID) */
static int
test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format)
@@ -6508,7 +6508,7 @@ test_refresh_concur(hid_t H5_ATTR_UNUSED in_fapl, hbool_t H5_ATTR_UNUSED new_for
return 0;
} /* test_refresh_concur() */
-#else /* defined(H5_HAVE_FORK && defined(H5_HAVE_WAITPID) */
+#else /* defined(H5_HAVE_FORK && defined(H5_HAVE_WAITPID) */
static int
test_refresh_concur(hid_t in_fapl, hbool_t new_format)
diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c
index 1700ece..9017793 100644
--- a/test/swmr_remove_reader.c
+++ b/test/swmr_remove_reader.c
@@ -122,7 +122,7 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor
* not work with SWMR currently (see note in swmr_generator.c), we
* simply initialize rec_id to 0. */
record->rec_id = (uint64_t)ULLONG_MAX - 1;
-#else /* FILLVAL_WORKS */
+#else /* FILLVAL_WORKS */
record->rec_id = (uint64_t)0;
#endif /* FILLVAL_WORKS */
if (H5Dread(dsid, symbol_tid, rec_sid, file_sid, H5P_DEFAULT, record) < 0)
diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c
index 14eef3d..4706b7a 100644
--- a/test/swmr_sparse_writer.c
+++ b/test/swmr_sparse_writer.c
@@ -150,7 +150,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f
unsigned long rec_to_flush; /* # of records left to write before flush */
#ifdef OUT
volatile int dummy; /* Dummy varialbe for busy sleep */
-#endif /* OUT */
+#endif /* OUT */
hsize_t dim[2] = {1, 0}; /* Dataspace dimensions */
unsigned long u, v; /* Local index variables */
diff --git a/test/tattr.c b/test/tattr.c
index ad669a1..7bc215d 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -5436,7 +5436,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
#ifdef LATER
h5_stat_size_t empty_size; /* Size of empty file */
h5_stat_size_t file_size; /* Size of file after operating on it */
-#endif /* LATER */
+#endif /* LATER */
unsigned curr_dset; /* Current dataset to work on */
unsigned u; /* Local index variable */
herr_t ret; /* Generic return value */
@@ -5602,7 +5602,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
CHECK(file_size, FAIL, "h5_get_file_size");
VERIFY(file_size, empty_size, "h5_get_file_size");
#endif /* LATER */
- } /* end for */
+ } /* end for */
/* Close property list */
ret = H5Pclose(dcpl);
@@ -6862,7 +6862,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx
hsize_t skip; /* # of attributes to skip on object */
#ifndef H5_NO_DEPRECATED_SYMBOLS
unsigned oskip; /* # of attributes to skip on object, with H5Aiterate1 */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
int old_nerrs; /* Number of errors when entering this check */
herr_t ret; /* Generic return value */
@@ -7054,7 +7054,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx
nvisit++;
VERIFY(skip, (max_attrs / 2), "H5Aiterate1");
- } /* end else */
+ } /* end else */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Iterate over attributes on object, stopping in the middle */
diff --git a/test/tfile.c b/test/tfile.c
index 94b3ea3..3d75f9b 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -7846,7 +7846,7 @@ test_file(void)
#ifndef H5_NO_DEPRECATED_SYMBOLS
test_file_ishdf5(env_h5_drvr); /* Test detecting HDF5 files correctly */
test_deprec(); /* Test deprecated routines */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
ret = H5Pclose(fapl_id);
CHECK(ret, FAIL, "H5Pclose");
diff --git a/test/th5o.c b/test/th5o.c
index c2409c1..8b67159 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -1737,7 +1737,7 @@ test_h5o(void)
test_h5o_open(); /* Test generic open function */
#ifndef H5_NO_DEPRECATED_SYMBOLS
test_h5o_open_by_addr(); /* Test opening objects by address */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
test_h5o_open_by_token(); /* Test opening objects by token */
test_h5o_close(); /* Test generic close function */
test_h5o_refcount(); /* Test incrementing and decrementing reference count */
diff --git a/test/thread_id.c b/test/thread_id.c
index e39b674..d8ddaf8 100644
--- a/test/thread_id.c
+++ b/test/thread_id.c
@@ -314,7 +314,7 @@ main(void)
return failed ? EXIT_FAILURE : EXIT_SUCCESS;
}
-#else /*H5_HAVE_THREADSAFE && !H5_HAVE_WIN_THREADS*/
+#else /*H5_HAVE_THREADSAFE && !H5_HAVE_WIN_THREADS*/
int
main(void)
{
diff --git a/test/tmisc.c b/test/tmisc.c
index 40a1df5..2d842be 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1256,7 +1256,7 @@ test_misc8(void)
#ifdef VERIFY_DATA
int *rdata; /* Data to read */
int *tdata2; /* Temporary pointer to data to read */
-#endif /* VERIFY_DATA */
+#endif /* VERIFY_DATA */
unsigned u, v; /* Local index variables */
int mdc_nelmts; /* Metadata number of elements */
size_t rdcc_nelmts; /* Raw data number of elements */
@@ -1578,7 +1578,7 @@ test_misc8(void)
if (storage_size >= (MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: data wasn't compressed! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
-#else /* Compression is not configured */
+#else /* Compression is not configured */
if (storage_size != (MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: wrong storage size! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
@@ -1612,7 +1612,7 @@ test_misc8(void)
if (storage_size >= (MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: data wasn't compressed! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
-#else /* Compression is not configured */
+#else /* Compression is not configured */
if (storage_size != (MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: wrong storage size! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
@@ -1677,7 +1677,7 @@ test_misc8(void)
if (storage_size >= (4 * MISC8_CHUNK_DIM0 * MISC8_CHUNK_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: data wasn't compressed! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
-#else /* Compression is not configured */
+#else /* Compression is not configured */
if (storage_size != (4 * MISC8_CHUNK_DIM0 * MISC8_CHUNK_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: wrong storage size! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
@@ -2963,7 +2963,7 @@ test_misc18(void)
hid_t aid; /* Attribute ID */
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5O_info1_t old_oinfo; /* (deprecated) information about object */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5O_info2_t oinfo; /* Data model information about object */
H5O_native_info_t ninfo; /* Native file format information about object */
char attr_name[32]; /* Attribute name buffer */
@@ -5082,7 +5082,7 @@ test_misc27(void)
H5E_BEGIN_TRY { gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT); }
H5E_END_TRY;
VERIFY(gid, FAIL, "H5Gopen2");
-#else /* H5_STRICT_FORMAT_CHECKS */
+#else /* H5_STRICT_FORMAT_CHECKS */
/* Open group with incorrect # of object header messages */
gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT);
CHECK(gid, FAIL, "H5Gopen2");
@@ -5399,7 +5399,7 @@ test_misc31(void)
hid_t group_id; /* Group id */
hid_t dtype_id; /* Datatype id */
herr_t ret; /* Generic return value */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Output message about test being performed */
MESSAGE(5, ("Deprecated routines initialize after H5close()\n"));
@@ -5474,7 +5474,7 @@ test_misc31(void)
ret = H5Tclose(dtype_id);
CHECK(ret, FAIL, "H5Tclose");
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
/* Output message about test being skipped */
MESSAGE(5, (" ...Skipped"));
#endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -5523,7 +5523,7 @@ test_misc32(void)
CHECK_PTR_NULL(buffer, "H5allocate_memory"); /*BAD*/
buffer = H5allocate_memory(0, TRUE);
CHECK_PTR_NULL(buffer, "H5allocate_memory"); /*BAD*/
-#endif /* NDEBUG */
+#endif /* NDEBUG */
/* RESIZE */
@@ -5542,7 +5542,7 @@ test_misc32(void)
#ifdef NDEBUG
resized = H5resize_memory(NULL, 0);
CHECK_PTR_NULL(resized, "H5resize_memory"); /*BAD*/
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end test_misc32() */
@@ -5700,7 +5700,7 @@ test_misc35(void)
CHECK(arr_size_start, 0, "H5get_free_list_sizes");
CHECK(blk_size_start, 0, "H5get_free_list_sizes");
CHECK(fac_size_start, 0, "H5get_free_list_sizes");
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
/* All the values should be == 0 */
VERIFY(reg_size_start, 0, "H5get_free_list_sizes");
VERIFY(arr_size_start, 0, "H5get_free_list_sizes");
@@ -5739,7 +5739,7 @@ test_misc35(void)
CHECK(alloc_stats.total_alloc_blocks_count, 0, "H5get_alloc_stats");
CHECK(alloc_stats.curr_alloc_blocks_count, 0, "H5get_alloc_stats");
CHECK(alloc_stats.peak_alloc_blocks_count, 0, "H5get_alloc_stats");
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
/* All the values should be == 0 */
VERIFY(alloc_stats.total_alloc_bytes, 0, "H5get_alloc_stats");
VERIFY(alloc_stats.curr_alloc_bytes, 0, "H5get_alloc_stats");
@@ -5787,7 +5787,7 @@ test_misc(void)
test_misc21(); /* Test that "late" allocation time is treated the same as "incremental", for chunked
datasets w/a filters */
test_misc22(); /* check szip bits per pixel */
-#endif /* H5_HAVE_FILTER_SZIP */
+#endif /* H5_HAVE_FILTER_SZIP */
test_misc23(); /* Test intermediate group creation */
test_misc24(); /* Test inappropriate API opens of objects */
test_misc25a(); /* Exercise null object header message merge bug */
diff --git a/test/tsohm.c b/test/tsohm.c
index 872875d..71e42e6 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -819,7 +819,7 @@ test_sohm_size1(void)
hsize_t oh_sizes[3];
unsigned oh_size_index = 0;
-#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
+#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
hsize_t norm_oh_size;
#endif /* Jira HDFFV-10646 */
hsize_t sohm_oh_size;
@@ -922,7 +922,7 @@ test_sohm_size1(void)
norm_empty_filesize = file_sizes[0];
norm_final_filesize = file_sizes[1];
norm_final_filesize2 = file_sizes[2];
-#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
+#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
norm_oh_size = oh_sizes[0];
#endif /* Jira HDFFV-10646 */
@@ -941,7 +941,7 @@ test_sohm_size1(void)
*/
VERIFY(sohm_btree_oh_size, sohm_oh_size, "H5Oget_info_by_name");
-#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
+#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
/* Object headers in SOHM files should be smaller than normal object
* headers.
*/
@@ -992,7 +992,7 @@ test_sohm_size1(void)
*
*---------------------------------------------------------------------------
*/
-#if 0 /* TODO: REVEALS BUG TO BE FIXED - SEE JIRA HDFFV-10645 */
+#if 0 /* TODO: REVEALS BUG TO BE FIXED - SEE JIRA HDFFV-10645 */
static void
test_sohm_size_consistency_open_create(void)
{
@@ -3822,7 +3822,7 @@ test_sohm(void)
test_sohm_size1(); /* Tests the sizes of files with one SOHM */
#if 0 /* TODO: REVEALS BUG TO BE FIXED - SEE JIRA HDFFV-10645 */
test_sohm_size_consistency_open_create();
-#endif /* Jira HDFFV-10645 */
+#endif /* Jira HDFFV-10645 */
test_sohm_attrs(); /* Tests shared messages in attributes */
test_sohm_size2(0); /* Tests the sizes of files with multiple SOHMs */
test_sohm_size2(1); /* Tests the sizes of files with multiple
diff --git a/test/ttsafe.c b/test/ttsafe.c
index 6862a0b..2b98ded 100644
--- a/test/ttsafe.c
+++ b/test/ttsafe.c
@@ -60,7 +60,7 @@ tts_is_threadsafe(void)
#ifdef H5_HAVE_THREADSAFE
is_ts = FALSE;
should_be = TRUE;
-#else /* H5_HAVE_THREADSAFE */
+#else /* H5_HAVE_THREADSAFE */
is_ts = TRUE;
should_be = FALSE;
#endif /* H5_HAVE_THREADSAFE */
diff --git a/test/vds.c b/test/vds.c
index a14e9c3..4c5929e 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -907,7 +907,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
TEST_ERROR
ex_dcpl = -1;
-#else /* VDS_POINT_SELECTIONS */
+#else /* VDS_POINT_SELECTIONS */
/*
* Test 3: Verify point selections fail
diff --git a/test/vfd.c b/test/vfd.c
index 5bf433f..da142b2 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -617,7 +617,7 @@ test_direct(void)
#ifndef H5_HAVE_DIRECT
SKIPPED();
return 0;
-#else /*H5_HAVE_DIRECT*/
+#else /*H5_HAVE_DIRECT*/
/* Set property list and file name for Direct driver. Set memory alignment boundary
* and file block size to 512 which is the minimum for Linux 2.6. */
@@ -2162,12 +2162,12 @@ static herr_t
test_ros3(void)
{
#ifdef H5_HAVE_ROS3_VFD
- hid_t fid = -1; /* file ID */
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t fapl_id_out = -1; /* from H5Fget_access_plist */
- hid_t driver_id = -1; /* ID for this VFD */
- unsigned long driver_flags = 0; /* VFD feature flags */
- char filename[1024]; /* filename */
+ hid_t fid = -1; /* file ID */
+ hid_t fapl_id = -1; /* file access property list ID */
+ hid_t fapl_id_out = -1; /* from H5Fget_access_plist */
+ hid_t driver_id = -1; /* ID for this VFD */
+ unsigned long driver_flags = 0; /* VFD feature flags */
+ char filename[1024]; /* filename */
H5FD_ros3_fapl_t test_ros3_fa;
H5FD_ros3_fapl_t ros3_fa_0 = {
/* version = */ H5FD_CURR_ROS3_FAPL_T_VERSION,
@@ -2183,7 +2183,7 @@ test_ros3(void)
#ifndef H5_HAVE_ROS3_VFD
SKIPPED();
return 0;
-#else /* H5_HAVE_ROS3_VFD */
+#else /* H5_HAVE_ROS3_VFD */
/* Set property list and file name for ROS3 driver. */
if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
diff --git a/test/vol.c b/test/vol.c
index 6076fca..045e271 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -174,13 +174,13 @@ static const H5VL_class_t fake_vol_g = {
static herr_t
test_vol_registration(void)
{
- hid_t native_id = H5I_INVALID_HID;
- hid_t lapl_id = H5I_INVALID_HID;
- hid_t vipl_id = H5I_INVALID_HID;
- herr_t ret = SUCCEED;
- htri_t is_registered = FAIL;
- hid_t vol_id = H5I_INVALID_HID;
- hid_t vol_id2 = H5I_INVALID_HID;
+ hid_t native_id = H5I_INVALID_HID;
+ hid_t lapl_id = H5I_INVALID_HID;
+ hid_t vipl_id = H5I_INVALID_HID;
+ herr_t ret = SUCCEED;
+ htri_t is_registered = FAIL;
+ hid_t vol_id = H5I_INVALID_HID;
+ hid_t vol_id2 = H5I_INVALID_HID;
H5VL_class_t *bad_fake_vol_class = NULL;
TESTING("VOL registration");
@@ -210,9 +210,8 @@ test_vol_registration(void)
TEST_ERROR;
HDmemcpy(bad_fake_vol_class, &fake_vol_g, sizeof(H5VL_class_t));
bad_fake_vol_class->version = H5VL_VERSION + 1;
- H5E_BEGIN_TRY {
- vol_id = H5VLregister_connector(bad_fake_vol_class, H5P_DEFAULT);
- } H5E_END_TRY;
+ H5E_BEGIN_TRY { vol_id = H5VLregister_connector(bad_fake_vol_class, H5P_DEFAULT); }
+ H5E_END_TRY;
if (H5I_INVALID_HID != vol_id)
FAIL_PUTS_ERROR("should not be able to register a connector with an incompatible version #");
HDfree(bad_fake_vol_class);
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index 536d312..3ec70fd 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -4220,7 +4220,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
herr_t ret;
#ifdef LATER /* fletcher32 */
H5Z_filter_t filter_info;
-#endif /* LATER */
+#endif /* LATER */
char message[256];
/* Set up MPI parameters */
@@ -4248,7 +4248,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
ret = H5Pset_fletcher32(dcpl);
VRFY((ret >= 0),"set filter (flecher32) succeeded");
-#endif /* LATER */
+#endif /* LATER */
}
else {
VRFY(0, "Unexpected mode, only test for TEST_FILTERS_READ.");
@@ -4290,7 +4290,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
test_name = "Broken Collective I/O - Filter is required";
no_collective_cause_local_expected = H5D_MPIO_FILTERS;
no_collective_cause_global_expected = H5D_MPIO_FILTERS;
-#endif /* LATER */
+#endif /* LATER */
/* Get the file dataspace */
file_space = H5Dget_space(dataset);
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 3989f2e..e0e03f2 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -2465,7 +2465,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
HDfprintf(stdout, "%d:%s: Bad data in read req reply.\n", world_mpi_rank, FUNC);
}
-#if 0 /* This has been useful debugging code -- keep it for now. */
+#if 0 /* This has been useful debugging code -- keep it for now. */
if ( mssg.req != READ_REQ_REPLY_CODE ) {
HDfprintf(stdout,
@@ -6880,7 +6880,7 @@ main(int argc, char **argv)
H5open();
express_test = do_express_test();
-#if 0 /* JRM */
+#if 0 /* JRM */
express_test = 0;
#endif /* JRM */
if (express_test) {
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index a50cb24..10d6c27 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -346,7 +346,7 @@ test_filter_read(void)
VRFY(hrc >= 0, "H5Pclose");
}
#endif /* H5_HAVE_FILTER_SZIP */
- } /* end for */
+ } /* end for */
/*----------------------------------------------------------
* STEP 4: Test shuffling by itself.
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index be3f6e1..1c5e875 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -578,7 +578,7 @@ hs_dr_pio_test__takedown(struct hs_dr_pio_test_vars_t *tv_ptr)
{
#if HS_DR_PIO_TEST__TAKEDOWN__DEBUG
const char *fcnName = "hs_dr_pio_test__takedown()";
-#endif /* HS_DR_PIO_TEST__TAKEDOWN__DEBUG */
+#endif /* HS_DR_PIO_TEST__TAKEDOWN__DEBUG */
int mpi_rank; /* needed by the VRFY macro */
herr_t ret; /* Generic return value */
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index aa72998..ec83d91 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -692,7 +692,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
/* Use the asprintf() routine, since it does what we're trying to do below */
if (HDasprintf(&obj1fullname, "/%s", objname1) < 0)
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
-#else /* H5_HAVE_ASPRINTF */
+#else /* H5_HAVE_ASPRINTF */
/* (malloc 2 more for "/" and end-of-line) */
if ((obj1fullname = (char *)HDmalloc(HDstrlen(objname1) + 2)) == NULL)
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -711,7 +711,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
/* Use the asprintf() routine, since it does what we're trying to do below */
if (HDasprintf(&obj2fullname, "/%s", objname2) < 0)
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
-#else /* H5_HAVE_ASPRINTF */
+#else /* H5_HAVE_ASPRINTF */
/* (malloc 2 more for "/" and end-of-line) */
if ((obj2fullname = (char *)HDmalloc(HDstrlen(objname2) + 2)) == NULL)
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -1174,7 +1174,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
if (HDasprintf(&obj1_fullpath, "%s%s", grp1_path, table->objs[i].name) < 0) {
H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
}
-#else /* H5_HAVE_ASPRINTF */
+#else /* H5_HAVE_ASPRINTF */
if ((obj1_fullpath = (char *)HDmalloc(HDstrlen(grp1_path) + HDstrlen(table->objs[i].name) + 1)) ==
NULL) {
H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -1192,7 +1192,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
if (HDasprintf(&obj2_fullpath, "%s%s", grp2_path, table->objs[i].name) < 0) {
H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
}
-#else /* H5_HAVE_ASPRINTF */
+#else /* H5_HAVE_ASPRINTF */
if ((obj2_fullpath = (char *)HDmalloc(HDstrlen(grp2_path) + HDstrlen(table->objs[i].name) + 1)) ==
NULL) {
H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -1388,7 +1388,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
} /* end else */
} /* end if */
} /* end else */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
if (obj1_fullpath)
HDfree(obj1_fullpath);
if (obj2_fullpath)
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index b3efeab..b998784 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -1279,7 +1279,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
}
nfound += diff_ldouble_element(mem1, mem2, elemtno, opts);
} /*H5T_NATIVE_LDOUBLE*/
-#endif /* H5_SIZEOF_LONG_DOUBLE */
+#endif /* H5_SIZEOF_LONG_DOUBLE */
break; /* H5T_FLOAT class */
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 01577db..533237c 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -932,7 +932,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
h5tools_str_append(str, OPT(info->fmt_llong, fmt_llong), templlong);
}
} /* end if (sizeof(long long) == nsize) */
-#endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
+#endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
break;
case H5T_COMPOUND:
@@ -1268,7 +1268,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
for (x = 0; x < ctx->indent_level + 1; x++)
h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
} /* end if */
-#endif /* LATER */
+#endif /* LATER */
ctx->indent_level++;
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 9c5999b..4d39816 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -194,10 +194,10 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
if (sp == 1 && argv[opt_ind][0] == '-' && argv[opt_ind][1] == '-') {
/* long command line option */
- int i;
- const char ch = '=';
- char *arg = &argv[opt_ind][2];
- size_t arg_len = 0;
+ int i;
+ const char ch = '=';
+ char * arg = &argv[opt_ind][2];
+ size_t arg_len = 0;
opt_arg = strchr(&argv[opt_ind][2], ch);
arg_len = HDstrlen(&argv[opt_ind][2]);
@@ -224,7 +224,7 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
else if (l_opts[i].has_arg == require_arg) {
if (opt_err)
HDfprintf(rawerrorstream, "%s: option required for \"--%s\" flag\n", argv[0],
- arg);
+ arg);
opt_opt = '?';
}
@@ -384,8 +384,6 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
* Programmer: Jacob Smith
* 2017-11-10
*
- * Changes: None.
- *
*****************************************************************************
*/
herr_t
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c
index 969dbab..80873fd 100644
--- a/tools/libtest/h5tools_test_utils.c
+++ b/tools/libtest/h5tools_test_utils.c
@@ -613,7 +613,7 @@ test_populate_ros3_fa(void)
hbool_t show_progress = FALSE;
int bad_version = 0xf87a; /* arbitrarily wrong version number */
-#endif /* H5_HAVE_ROS3_VFD */
+#endif /* H5_HAVE_ROS3_VFD */
TESTING("programmatic ros3 fapl population");
@@ -1028,7 +1028,7 @@ test_set_configured_fapl(void)
"", /* user name */
2048, /* stream buffer size */
};
-#endif /* H5_HAVE_LIBHDFS */
+#endif /* H5_HAVE_LIBHDFS */
unsigned n_cases = 7; /* number of common testcases */
testcase cases[] = {
{
@@ -1279,7 +1279,7 @@ main(void)
#ifdef _H5TEST_
h5reset(); /* h5test? */
-#endif /* _H5TEST_ */
+#endif /* _H5TEST_ */
HDfprintf(stdout, "Testing h5tools_utils corpus.\n");
diff --git a/tools/src/h5dump/h5dump.h b/tools/src/h5dump/h5dump.h
index 9392ca3..b4198ad 100644
--- a/tools/src/h5dump/h5dump.h
+++ b/tools/src/h5dump/h5dump.h
@@ -83,7 +83,7 @@ typedef struct {
dump_opt_t dump_opts = {TRUE, FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE,
TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, 0};
-#define PACKED_BITS_MAX 8 /* Maximum number of packed-bits to display */
+#define PACKED_BITS_MAX 8 /* Maximum number of packed-bits to display */
#define PACKED_BITS_SIZE_MAX (8 * sizeof(long long)) /* Maximum bits size of integer types of packed-bits */
/* mask list for packed bits */
unsigned long long packed_mask[PACKED_BITS_MAX]; /* packed bits are restricted to 8*sizeof(llong) bytes */
diff --git a/tools/src/h5dump/h5dump_extern.h b/tools/src/h5dump/h5dump_extern.h
index 56734cf..6ccd159 100644
--- a/tools/src/h5dump/h5dump_extern.h
+++ b/tools/src/h5dump/h5dump_extern.h
@@ -80,7 +80,7 @@ typedef struct {
} dump_opt_t;
extern dump_opt_t dump_opts;
-#define PACKED_BITS_MAX 8 /* Maximum number of packed-bits to display */
+#define PACKED_BITS_MAX 8 /* Maximum number of packed-bits to display */
#define PACKED_BITS_SIZE_MAX 8 * sizeof(long long) /* Maximum bits size of integer types of packed-bits */
/* mask list for packed bits */
extern unsigned long long
diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c
index df4c569..22aca04 100644
--- a/tools/test/perform/perf.c
+++ b/tools/test/perform/perf.c
@@ -465,7 +465,7 @@ parse_args(int argc, char **argv)
* End:
*/
-#else /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
/* dummy program since H5_HAVE_PARALLEL is not configured in */
int
main(int H5_ATTR_UNUSED argc, char H5_ATTR_UNUSED **argv)
diff --git a/tools/test/perform/pio_standalone.h b/tools/test/perform/pio_standalone.h
index 2f812d7..d64f421 100644
--- a/tools/test/perform/pio_standalone.h
+++ b/tools/test/perform/pio_standalone.h
@@ -224,14 +224,14 @@ H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
#define HDisalnum(C) isalnum((int)(C)) /*cast for solaris warning*/
#define HDisalpha(C) isalpha((int)(C)) /*cast for solaris warning*/
#define HDisatty(F) isatty(F)
-#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
-#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
-#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
-#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
-#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
-#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
-#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
-#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
+#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
+#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
+#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
+#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
+#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
+#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
+#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
+#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
#define HDisxdigit(C) isxdigit((int)(C)) /*cast for solaris warning*/
#define HDkill(P, S) kill(P, S)
#define HDlabs(X) labs(X)
@@ -458,7 +458,7 @@ H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap)
#else /* H5_HAVE_WIN32_API */
#if !defined strdup && !defined H5_HAVE_STRDUP
-extern char *strdup(const char *s);
+extern char * strdup(const char *s);
#endif
#define HDstrdup(S) strdup(S)
diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h
index c0e0793..4001257 100644
--- a/tools/test/perform/sio_standalone.h
+++ b/tools/test/perform/sio_standalone.h
@@ -239,14 +239,14 @@ H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
#define HDisalnum(C) isalnum((int)(C)) /*cast for solaris warning*/
#define HDisalpha(C) isalpha((int)(C)) /*cast for solaris warning*/
#define HDisatty(F) isatty(F)
-#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
-#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
-#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
-#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
-#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
-#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
-#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
-#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
+#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
+#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
+#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
+#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
+#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
+#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
+#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
+#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
#define HDisxdigit(C) isxdigit((int)(C)) /*cast for solaris warning*/
#define HDkill(P, S) kill(P, S)
#define HDlabs(X) labs(X)
@@ -473,7 +473,7 @@ H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap)
#else /* H5_HAVE_WIN32_API */
#if !defined strdup && !defined H5_HAVE_STRDUP
-extern char *strdup(const char *s);
+extern char * strdup(const char *s);
#endif
#define HDstrdup(S) strdup(S)