diff options
author | Neil Fortner <nfortne2@hdfgroup.org> | 2017-05-01 22:25:02 (GMT) |
---|---|---|
committer | Neil Fortner <nfortne2@hdfgroup.org> | 2017-05-01 22:25:02 (GMT) |
commit | 58c4806cd961e30d9b5658ca449bcb695e7fcb56 (patch) | |
tree | 14cf3d453e5824ef88532cb04ea8fdb94590dfbe /examples/h5dsm_attr_write.c | |
parent | 72b57518eb02e1df92d0e3ae7b29f09bbafe937c (diff) | |
download | hdf5-58c4806cd961e30d9b5658ca449bcb695e7fcb56.zip hdf5-58c4806cd961e30d9b5658ca449bcb695e7fcb56.tar.gz hdf5-58c4806cd961e30d9b5658ca449bcb695e7fcb56.tar.bz2 |
Implement H5Oopen, H5Oopen_by_addr, H5Acreate_by_name, H5Aopen_by_name,
and H5Aiterate_by_name. Add h5dsm_obj_open.c example. Fix memory leak on dataset open. Other minor
fixes/cleanup.
Diffstat (limited to 'examples/h5dsm_attr_write.c')
-rw-r--r-- | examples/h5dsm_attr_write.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/examples/h5dsm_attr_write.c b/examples/h5dsm_attr_write.c index 1b233d2..8bb8f6e 100644 --- a/examples/h5dsm_attr_write.c +++ b/examples/h5dsm_attr_write.c @@ -4,7 +4,7 @@ int main(int argc, char *argv[]) { uuid_t pool_uuid; char *pool_grp = NULL; - hid_t file = -1, obj = -1, attr = -1, fapl = -1; + hid_t file = -1, attr = -1, fapl = -1; H5VL_daosm_snap_id_t snap_id; int buf[4][6]; int i, j; @@ -14,8 +14,8 @@ int main(int argc, char *argv[]) { /* Seed random number generator */ srand(time(NULL)); - if(argc < 6 || argc > 7) - PRINTF_ERROR("argc must be 6 or 7\n"); + if(argc < 5 || argc > 6) + PRINTF_ERROR("argc must be 5 or 6\n"); /* Parse UUID */ if(0 != uuid_parse(argv[1], pool_uuid)) @@ -37,20 +37,8 @@ int main(int argc, char *argv[]) { if((file = H5Fopen(argv[2], H5F_ACC_RDWR, fapl)) < 0) ERROR; - /* Open object */ - if(!strcmp(argv[3], "-d") || !strcmp(argv[3], "-D")) { - if((obj = H5Dopen2(file, argv[4], H5P_DEFAULT)) < 0) - ERROR; - } - else { - if(strcmp(argv[3], "-g") && strcmp(argv[3], "-G")) - PRINTF_ERROR("argv[3] must be -d, -D, -g, or -G\n"); - if((obj = H5Gopen2(file, argv[4], H5P_DEFAULT)) < 0) - ERROR; - } - /* Open attribute */ - if((attr = H5Aopen(obj, argv[5], H5P_DEFAULT)) < 0) + if((attr = H5Aopen_by_name(file, argv[3], argv[4], H5P_DEFAULT, H5P_DEFAULT)) < 0) ERROR; /* Fill and print buffer */ @@ -68,7 +56,7 @@ int main(int argc, char *argv[]) { ERROR; /* Save snapshot if requested */ - if(argc == 7) { + if(argc == 6) { if(H5VLdaosm_snap_create(file, &snap_id) < 0) ERROR; printf("Saved snapshot: snap_id = %llu\n", (long long unsigned)snap_id); @@ -77,8 +65,6 @@ int main(int argc, char *argv[]) { /* Close */ if(H5Aclose(attr) < 0) ERROR; - if(H5Oclose(obj) < 0) - ERROR; if(H5Fclose(file) < 0) ERROR; if(H5Pclose(fapl) < 0) @@ -92,7 +78,6 @@ int main(int argc, char *argv[]) { error: H5E_BEGIN_TRY { H5Aclose(attr); - H5Oclose(obj); H5Fclose(file); H5Pclose(fapl); } H5E_END_TRY; |