diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-09-05 21:52:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-05 21:52:30 (GMT) |
commit | 8253ab9ebf6a082dc07eb931f27b169d6a45d577 (patch) | |
tree | 47630856491e54f5d28e1608ffa5e2f976dc9c95 /src/H5Faccum.c | |
parent | 920869796031ed4ee9c1fbea8aaccda3592a88b3 (diff) | |
download | hdf5-8253ab9ebf6a082dc07eb931f27b169d6a45d577.zip hdf5-8253ab9ebf6a082dc07eb931f27b169d6a45d577.tar.gz hdf5-8253ab9ebf6a082dc07eb931f27b169d6a45d577.tar.bz2 |
Convert hbool_t --> bool in src (#3496)
* hbool_t --> bool in src
* Does not remove TRUE/FALSE
* Public header files are unchanged
* Public API calls are unchanged
* TRUE/FALSE --> true/false in src
* Add deprecation notice for hbool_t
Diffstat (limited to 'src/H5Faccum.c')
-rw-r--r-- | src/H5Faccum.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/H5Faccum.c b/src/H5Faccum.c index e621e98..758b015 100644 --- a/src/H5Faccum.c +++ b/src/H5Faccum.c @@ -333,7 +333,7 @@ H5F__accum_adjust(H5F_meta_accum_t *accum, H5FD_t *file, H5F_accum_adjust_t adju HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "file write failed"); /* Reset accumulator dirty flag */ - accum->dirty = FALSE; + accum->dirty = false; } /* end if */ } /* end if */ else { @@ -346,7 +346,7 @@ H5F__accum_adjust(H5F_meta_accum_t *accum, H5FD_t *file, H5F_accum_adjust_t adju HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "file write failed"); /* Reset accumulator dirty flag */ - accum->dirty = FALSE; + accum->dirty = false; } /* end if */ /* Adjust dirty region tracking info */ @@ -448,7 +448,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s accum->dirty_len = size + accum->dirty_off + accum->dirty_len; else { accum->dirty_len = size; - accum->dirty = TRUE; + accum->dirty = true; } /* end else */ accum->dirty_off = 0; } /* end if */ @@ -467,7 +467,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s else { accum->dirty_off = accum->size; accum->dirty_len = size; - accum->dirty = TRUE; + accum->dirty = true; } /* end else */ /* Set the new size of the metadata accumulator */ @@ -505,7 +505,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s else { accum->dirty_off = dirty_off; accum->dirty_len = size; - accum->dirty = TRUE; + accum->dirty = true; } /* end else */ } /* end if */ /* Check if the new metadata overlaps the beginning of the current accumulator */ @@ -546,7 +546,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s else { accum->dirty_off = 0; accum->dirty_len = size; - accum->dirty = TRUE; + accum->dirty = true; } /* end else */ } /* end if */ /* Check if the new metadata overlaps the end of the current accumulator */ @@ -585,7 +585,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s else { accum->dirty_off = dirty_off; accum->dirty_len = size; - accum->dirty = TRUE; + accum->dirty = true; } /* end else */ } /* end if */ /* New metadata overlaps both ends of the current accumulator */ @@ -620,7 +620,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s /* Adjust the dirty region and mark accumulator dirty */ accum->dirty_off = 0; accum->dirty_len = size; - accum->dirty = TRUE; + accum->dirty = true; } /* end else */ } /* end if */ /* New piece of metadata doesn't adjoin or overlap the existing accumulator */ @@ -632,7 +632,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed"); /* Reset accumulator dirty flag */ - accum->dirty = FALSE; + accum->dirty = false; } /* end if */ /* Cache the new piece of metadata */ @@ -683,7 +683,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s /* Adjust the dirty region and mark accumulator dirty */ accum->dirty_off = 0; accum->dirty_len = size; - accum->dirty = TRUE; + accum->dirty = true; } /* end else */ } /* end if */ /* No metadata in the accumulator, grab this piece and keep it */ @@ -717,14 +717,14 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s /* Adjust the dirty region and mark accumulator dirty */ accum->dirty_off = 0; accum->dirty_len = size; - accum->dirty = TRUE; + accum->dirty = true; } /* end else */ } /* end if */ else { /* Make certain that data in accumulator is visible before new write */ if ((H5F_SHARED_INTENT(f_sh) & H5F_ACC_SWMR_WRITE) > 0) /* Flush if dirty and reset accumulator */ - if (H5F__accum_reset(f_sh, TRUE) < 0) + if (H5F__accum_reset(f_sh, true) < 0) HGOTO_ERROR(H5E_IO, H5E_CANTRESET, FAIL, "can't reset accumulator"); /* Write the data */ @@ -754,7 +754,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s /* Check if entire dirty region is overwritten */ if (H5_addr_le(dirty_end, addr + size)) { - accum->dirty = FALSE; + accum->dirty = false; accum->dirty_len = 0; } /* end if */ else { @@ -775,7 +775,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s } /* end if */ else { /* Access covers whole accumulator */ /* Reset accumulator, but don't flush */ - if (H5F__accum_reset(f_sh, FALSE) < 0) + if (H5F__accum_reset(f_sh, false) < 0) HGOTO_ERROR(H5E_IO, H5E_CANTRESET, FAIL, "can't reset accumulator"); } /* end else */ } /* end if */ @@ -797,7 +797,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s /* Check if entire dirty region is overwritten */ if (H5_addr_ge(dirty_start, addr)) { - accum->dirty = FALSE; + accum->dirty = false; accum->dirty_len = 0; } /* end if */ else { @@ -870,7 +870,7 @@ H5F__accum_free(H5F_shared_t *f_sh, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr /* Reset the accumulator, but don't free buffer */ accum->loc = HADDR_UNDEF; accum->size = 0; - accum->dirty = FALSE; + accum->dirty = false; } /* end if */ /* Block to free must end within the accumulator */ else { @@ -900,7 +900,7 @@ H5F__accum_free(H5F_shared_t *f_sh, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr } /* end if */ /* Block freed encompasses dirty region */ else - accum->dirty = FALSE; + accum->dirty = false; } /* end else */ } /* end if */ } /* end else */ @@ -947,7 +947,7 @@ H5F__accum_free(H5F_shared_t *f_sh, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr } /* end if */ /* Reset dirty flag */ - accum->dirty = FALSE; + accum->dirty = false; } /* end if */ /* Block to free begins at beginning of or in middle of dirty region */ else { @@ -970,7 +970,7 @@ H5F__accum_free(H5F_shared_t *f_sh, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr /* Check for block to free beginning at same location as dirty region */ if (H5_addr_eq(addr, dirty_start)) { /* Reset dirty flag */ - accum->dirty = FALSE; + accum->dirty = false; } /* end if */ /* Block to free eliminates end of dirty region */ else { @@ -1021,7 +1021,7 @@ H5F__accum_flush(H5F_shared_t *f_sh) HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed"); /* Reset the dirty flag */ - f_sh->accum.dirty = FALSE; + f_sh->accum.dirty = false; } /* end if */ done: @@ -1038,7 +1038,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5F__accum_reset(H5F_shared_t *f_sh, hbool_t flush) +H5F__accum_reset(H5F_shared_t *f_sh, bool flush) { herr_t ret_value = SUCCEED; /* Return value */ @@ -1061,7 +1061,7 @@ H5F__accum_reset(H5F_shared_t *f_sh, hbool_t flush) /* Reset the buffer sizes & location */ f_sh->accum.alloc_size = f_sh->accum.size = 0; f_sh->accum.loc = HADDR_UNDEF; - f_sh->accum.dirty = FALSE; + f_sh->accum.dirty = false; f_sh->accum.dirty_len = 0; } /* end if */ |