From ef97f72cb0741ba7da728752a4c64d40ba4550e0 Mon Sep 17 00:00:00 2001 From: "H. Joe Lee" Date: Fri, 28 Apr 2023 09:04:42 -0500 Subject: [PATCH 1/7] fix(lib): remove unused variable in H5C.c Sunspot compiler throws a warning. --- src/H5C.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/H5C.c b/src/H5C.c index 8a97e47ea4d..c392b032c42 100644 --- a/src/H5C.c +++ b/src/H5C.c @@ -6579,7 +6579,6 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitted) H5C_cache_entry_t *entry_ptr; H5C_cache_entry_t *prev_ptr; H5C_cache_entry_t *next_ptr; - uint32_t num_corked_entries = 0; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE From 85a7688316eb3bb9b302eb42a912df820c515d8d Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 14:06:59 +0000 Subject: [PATCH 2/7] Committing clang-format changes --- src/H5C.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5C.c b/src/H5C.c index c392b032c42..52f94e5b143 100644 --- a/src/H5C.c +++ b/src/H5C.c @@ -6579,7 +6579,7 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitted) H5C_cache_entry_t *entry_ptr; H5C_cache_entry_t *prev_ptr; H5C_cache_entry_t *next_ptr; - herr_t ret_value = SUCCEED; /* Return value */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE From 7201e125e9441ed572dc961ed7767185da724cc7 Mon Sep 17 00:00:00 2001 From: Hyo-Kyung Lee Date: Fri, 28 Apr 2023 09:53:02 -0500 Subject: [PATCH 3/7] fix(lib): check intel compiler --- src/H5C.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/H5C.c b/src/H5C.c index 52f94e5b143..78d06230b5b 100644 --- a/src/H5C.c +++ b/src/H5C.c @@ -6579,6 +6579,9 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitted) H5C_cache_entry_t *entry_ptr; H5C_cache_entry_t *prev_ptr; H5C_cache_entry_t *next_ptr; +#if !defined(SYCL_LANGUAGE_VERSION) || !defined (__INTEL_LLVM_COMPILER) + uint32_t num_corked_entries = 0; +#endif herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE From 7d5ef60611deb9c6245011891fee446d14b8aebf Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 14:55:37 +0000 Subject: [PATCH 4/7] Committing clang-format changes --- src/H5C.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/H5C.c b/src/H5C.c index 78d06230b5b..74a45834b9a 100644 --- a/src/H5C.c +++ b/src/H5C.c @@ -6579,10 +6579,10 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitted) H5C_cache_entry_t *entry_ptr; H5C_cache_entry_t *prev_ptr; H5C_cache_entry_t *next_ptr; -#if !defined(SYCL_LANGUAGE_VERSION) || !defined (__INTEL_LLVM_COMPILER) +#if !defined(SYCL_LANGUAGE_VERSION) || !defined(__INTEL_LLVM_COMPILER) uint32_t num_corked_entries = 0; -#endif - herr_t ret_value = SUCCEED; /* Return value */ +#endif + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE From 23123532996b6228996daf3b10d729332da50c20 Mon Sep 17 00:00:00 2001 From: Hyo-Kyung Lee Date: Fri, 28 Apr 2023 11:33:40 -0500 Subject: [PATCH 5/7] fix(lib): remove intel compiler warning --- src/H5C.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/H5C.c b/src/H5C.c index 74a45834b9a..be6a14cbbe9 100644 --- a/src/H5C.c +++ b/src/H5C.c @@ -6579,9 +6579,7 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitted) H5C_cache_entry_t *entry_ptr; H5C_cache_entry_t *prev_ptr; H5C_cache_entry_t *next_ptr; -#if !defined(SYCL_LANGUAGE_VERSION) || !defined(__INTEL_LLVM_COMPILER) uint32_t num_corked_entries = 0; -#endif herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -6630,7 +6628,7 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitted) if (entry_ptr->is_dirty && (entry_ptr->tag_info && entry_ptr->tag_info->corked)) { /* Skip "dirty" corked entries. */ - ++num_corked_entries; + num_corked_entries = num_corked_netries + 1; didnt_flush_entry = TRUE; } else if ((entry_ptr->type->id != H5AC_EPOCH_MARKER_ID) && !entry_ptr->flush_in_progress && From ffe9cffb35f49167b6a751d924b77ee9eed23359 Mon Sep 17 00:00:00 2001 From: Hyo-Kyung Lee Date: Fri, 28 Apr 2023 11:34:32 -0500 Subject: [PATCH 6/7] fix(lib): typo --- src/H5C.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5C.c b/src/H5C.c index be6a14cbbe9..e1a6bc7bd88 100644 --- a/src/H5C.c +++ b/src/H5C.c @@ -6628,7 +6628,7 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitted) if (entry_ptr->is_dirty && (entry_ptr->tag_info && entry_ptr->tag_info->corked)) { /* Skip "dirty" corked entries. */ - num_corked_entries = num_corked_netries + 1; + num_corked_entries = num_corked_entries + 1; didnt_flush_entry = TRUE; } else if ((entry_ptr->type->id != H5AC_EPOCH_MARKER_ID) && !entry_ptr->flush_in_progress && From 23aee5edecce61270e43725d27520e2f318631ed Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:37:18 +0000 Subject: [PATCH 7/7] Committing clang-format changes --- src/H5C.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/H5C.c b/src/H5C.c index e1a6bc7bd88..a0f80f14616 100644 --- a/src/H5C.c +++ b/src/H5C.c @@ -6579,8 +6579,8 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitted) H5C_cache_entry_t *entry_ptr; H5C_cache_entry_t *prev_ptr; H5C_cache_entry_t *next_ptr; - uint32_t num_corked_entries = 0; - herr_t ret_value = SUCCEED; /* Return value */ + uint32_t num_corked_entries = 0; + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -6629,7 +6629,7 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t write_permitted) if (entry_ptr->is_dirty && (entry_ptr->tag_info && entry_ptr->tag_info->corked)) { /* Skip "dirty" corked entries. */ num_corked_entries = num_corked_entries + 1; - didnt_flush_entry = TRUE; + didnt_flush_entry = TRUE; } else if ((entry_ptr->type->id != H5AC_EPOCH_MARKER_ID) && !entry_ptr->flush_in_progress && !entry_ptr->prefetched_dirty) {