diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2022-04-18 12:29:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-18 12:29:00 (GMT) |
| commit | 17be6c2574222bf146ddc01eb3c8e344b1efddd0 (patch) | |
| tree | fe398ef17020d852fd3b13120f13733747426ac3 /hl/src/H5TB.c | |
| parent | a80897ee4944ff6008bfb3b93619ebcb58a070d1 (diff) | |
| download | hdf5-17be6c2574222bf146ddc01eb3c8e344b1efddd0.zip hdf5-17be6c2574222bf146ddc01eb3c8e344b1efddd0.tar.gz hdf5-17be6c2574222bf146ddc01eb3c8e344b1efddd0.tar.bz2 | |
Cleans up some HL library code that inappropriately returns htri_t values cast to herr_t (#1651)
* Cleans up some HL library code that inappropriately returns
htri_t values cast to herr_t
* Committing clang-format changes
* Formatted source
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'hl/src/H5TB.c')
| -rw-r--r-- | hl/src/H5TB.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c index efa61a3..eda3a35 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -2585,11 +2585,11 @@ H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name) HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_FILL", (int)i); /* check if we have the _FILL attribute */ - if ((has_fill = H5LT_find_attribute(did_1, attr_name)) < 0) + if ((has_fill = H5Aexists(did_1, attr_name)) < 0) goto out; /* get it */ - if (has_fill) + if (has_fill > 0) if (H5LT_get_attribute_disk(did_1, attr_name, tmp_fill_buf + curr_offset) < 0) goto out; @@ -2747,7 +2747,7 @@ H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name) * attach the fill attributes from previous table *------------------------------------------------------------------------- */ - if (has_fill) { + if (has_fill > 0) { if ((sid_1 = H5Screate(H5S_SCALAR)) < 0) goto out; @@ -2918,15 +2918,15 @@ H5TBAget_fill(hid_t loc_id, const char *dset_name, hid_t dset_id, unsigned char for (i = 0; i < nfields; i++) { HDsnprintf(attr_name, sizeof(attr_name), "FIELD_%d_FILL", (int)i); - /* check if we have the _FILL attribute */ - if ((has_fill = H5LT_find_attribute(dset_id, attr_name)) < 0) + /* Check if we have the _FILL attribute */ + if ((has_fill = H5Aexists(dset_id, attr_name)) < 0) goto out; /* get it */ - if (has_fill) + if (has_fill > 0) if (H5LT_get_attribute_disk(dset_id, attr_name, dst_buf + src_offset[i]) < 0) goto out; - } /* end for */ + } ret_val = has_fill; |