diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2020-11-30 21:59:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 21:59:22 (GMT) |
| commit | 123c5a653dbe3867e06eb8c31da952b7ef042f95 (patch) | |
| tree | 077e9e2951b85e5c38ed0c9ea11c6baa396879e9 /tools/src | |
| parent | cadd6db431e2664e6dd3f2460639a27d21c6c8a9 (diff) | |
| download | hdf5-123c5a653dbe3867e06eb8c31da952b7ef042f95.zip hdf5-123c5a653dbe3867e06eb8c31da952b7ef042f95.tar.gz hdf5-123c5a653dbe3867e06eb8c31da952b7ef042f95.tar.bz2 | |
Expand 'opt_query' VOL callback to return a bitfield instead of a flag (#136)
* Expand 'opt_query' VOL callback to return a bitfield instead of a flag
* Correct pastos
Diffstat (limited to 'tools/src')
| -rw-r--r-- | tools/src/h5dump/h5dump_ddl.c | 4 | ||||
| -rw-r--r-- | tools/src/h5ls/h5ls.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c index 8c637b1..5566b8f 100644 --- a/tools/src/h5dump/h5dump_ddl.c +++ b/tools/src/h5dump/h5dump_ddl.c @@ -1154,7 +1154,7 @@ dump_fcpl(hid_t fid) unsigned sym_ik; /* symbol table B-tree internal 'K' value */ unsigned istore_ik; /* indexed storage B-tree internal 'K' value */ - hbool_t supported = FALSE; + uint64_t supported = 0; /* Dumping the information here only makes sense for the native * VOL connector. The only VOL call here is H5Fget_info(), so we'll @@ -1163,7 +1163,7 @@ dump_fcpl(hid_t fid) */ H5VLquery_optional(fid, H5VL_SUBCLS_FILE, H5VL_NATIVE_FILE_GET_INFO, &supported); - if (!supported) + if (!(supported & H5VL_OPT_QUERY_SUPPORTED)) return; fcpl = H5Fget_create_plist(fid); diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index 9ebd4d5..dd21bb1 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -2157,11 +2157,11 @@ list_obj(const char *name, const H5O_info2_t *oinfo, const char *first_seen, voi /* Show detailed information about the object, beginning with information * which is common to all objects. */ if (verbose_g > 0) { - size_t buf_size = 0; - char * comment = NULL; - char * obj_tok_str = NULL; - ssize_t cmt_bufsize = -1; - hbool_t supported = FALSE; + size_t buf_size = 0; + char * comment = NULL; + char * obj_tok_str = NULL; + ssize_t cmt_bufsize = -1; + uint64_t supported = 0; /* Display attributes */ H5TOOLS_DEBUG("Display attributes"); @@ -2200,7 +2200,7 @@ list_obj(const char *name, const H5O_info2_t *oinfo, const char *first_seen, voi /* Only emit comments if the VOL connector supports that */ H5VLquery_optional(obj_id, H5VL_SUBCLS_OBJECT, H5VL_NATIVE_OBJECT_GET_COMMENT, &supported); - if (supported) { + if (supported & H5VL_OPT_QUERY_SUPPORTED) { /* Object comment */ cmt_bufsize = H5Oget_comment(obj_id, comment, buf_size); |