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/H5Tfields.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/H5Tfields.c')
| -rw-r--r-- | src/H5Tfields.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/H5Tfields.c b/src/H5Tfields.c index 9d423d1..4ed4f52 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -261,7 +261,7 @@ H5T__sort_value(const H5T_t *dt, int *map) { unsigned nmembs; /* Number of members for datatype */ size_t size; - hbool_t swapped; /* Whether we've swapped fields */ + bool swapped; /* Whether we've swapped fields */ uint8_t tbuf[32]; unsigned i, j; /* Local index variables */ herr_t ret_value = SUCCEED; /* Return value */ @@ -277,8 +277,8 @@ H5T__sort_value(const H5T_t *dt, int *map) if (H5T_SORT_VALUE != dt->shared->u.compnd.sorted) { dt->shared->u.compnd.sorted = H5T_SORT_VALUE; nmembs = dt->shared->u.compnd.nmembs; - for (i = nmembs - 1, swapped = TRUE; i > 0 && swapped; --i) { - for (j = 0, swapped = FALSE; j < i; j++) { + for (i = nmembs - 1, swapped = true; i > 0 && swapped; --i) { + for (j = 0, swapped = false; j < i; j++) { if (dt->shared->u.compnd.memb[j].offset > dt->shared->u.compnd.memb[j + 1].offset) { H5T_cmemb_t tmp = dt->shared->u.compnd.memb[j]; dt->shared->u.compnd.memb[j] = dt->shared->u.compnd.memb[j + 1]; @@ -289,7 +289,7 @@ H5T__sort_value(const H5T_t *dt, int *map) map[j] = map[j + 1]; map[j + 1] = x; } /* end if */ - swapped = TRUE; + swapped = true; } /* end if */ } /* end for */ } /* end for */ @@ -306,8 +306,8 @@ H5T__sort_value(const H5T_t *dt, int *map) nmembs = dt->shared->u.enumer.nmembs; size = dt->shared->size; assert(size <= sizeof(tbuf)); - for (i = (nmembs - 1), swapped = TRUE; i > 0 && swapped; --i) { - for (j = 0, swapped = FALSE; j < i; j++) { + for (i = (nmembs - 1), swapped = true; i > 0 && swapped; --i) { + for (j = 0, swapped = false; j < i; j++) { if (memcmp((uint8_t *)dt->shared->u.enumer.value + (j * size), (uint8_t *)dt->shared->u.enumer.value + ((j + 1) * size), size) > 0) { /* Swap names */ @@ -329,7 +329,7 @@ H5T__sort_value(const H5T_t *dt, int *map) map[j + 1] = x; } /* end if */ - swapped = TRUE; + swapped = true; } /* end if */ } /* end for */ } /* end for */ @@ -363,7 +363,7 @@ H5T__sort_name(const H5T_t *dt, int *map) { unsigned i, j, nmembs; size_t size; - hbool_t swapped; + bool swapped; uint8_t tbuf[32]; FUNC_ENTER_PACKAGE_NOERR @@ -377,14 +377,14 @@ H5T__sort_name(const H5T_t *dt, int *map) if (H5T_SORT_NAME != dt->shared->u.compnd.sorted) { dt->shared->u.compnd.sorted = H5T_SORT_NAME; nmembs = dt->shared->u.compnd.nmembs; - for (i = nmembs - 1, swapped = TRUE; i > 0 && swapped; --i) { - for (j = 0, swapped = FALSE; j < i; j++) { + for (i = nmembs - 1, swapped = true; i > 0 && swapped; --i) { + for (j = 0, swapped = false; j < i; j++) { if (HDstrcmp(dt->shared->u.compnd.memb[j].name, dt->shared->u.compnd.memb[j + 1].name) > 0) { H5T_cmemb_t tmp = dt->shared->u.compnd.memb[j]; dt->shared->u.compnd.memb[j] = dt->shared->u.compnd.memb[j + 1]; dt->shared->u.compnd.memb[j + 1] = tmp; - swapped = TRUE; + swapped = true; if (map) { int x = map[j]; map[j] = map[j + 1]; @@ -408,8 +408,8 @@ H5T__sort_name(const H5T_t *dt, int *map) nmembs = dt->shared->u.enumer.nmembs; size = dt->shared->size; assert(size <= sizeof(tbuf)); - for (i = nmembs - 1, swapped = TRUE; i > 0 && swapped; --i) { - for (j = 0, swapped = FALSE; j < i; j++) { + for (i = nmembs - 1, swapped = true; i > 0 && swapped; --i) { + for (j = 0, swapped = false; j < i; j++) { if (HDstrcmp(dt->shared->u.enumer.name[j], dt->shared->u.enumer.name[j + 1]) > 0) { /* Swap names */ char *tmp = dt->shared->u.enumer.name[j]; @@ -429,7 +429,7 @@ H5T__sort_name(const H5T_t *dt, int *map) map[j + 1] = x; } - swapped = TRUE; + swapped = true; } } } |