diff options
author | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
commit | 628d267162895adef5a73e1cd5810030cc98335a (patch) | |
tree | 05471ae798eaef041ea98fecdd285c9380ce381a /tools/test/h5jam/getub.c | |
parent | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (diff) | |
parent | 7e93acd94f20c73d27bb2eb4f7b4389d88cfb299 (diff) | |
download | hdf5-628d267162895adef5a73e1cd5810030cc98335a.zip hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.gz hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.bz2 |
merge and fix conflict
Diffstat (limited to 'tools/test/h5jam/getub.c')
-rw-r--r-- | tools/test/h5jam/getub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c index 26a427d..f496a7a 100644 --- a/tools/test/h5jam/getub.c +++ b/tools/test/h5jam/getub.c @@ -81,7 +81,7 @@ parse_command_line(int argc, const char *argv[]) int main(int argc, const char *argv[]) { - int fd = -1; + int fd = H5I_INVALID_HID; unsigned size; char *filename = NULL; long res; |