diff options
Diffstat (limited to 'examples/h5dsm_attr_open.c')
-rw-r--r-- | examples/h5dsm_attr_open.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/examples/h5dsm_attr_open.c b/examples/h5dsm_attr_open.c index adc0ce2..30eb075 100644 --- a/examples/h5dsm_attr_open.c +++ b/examples/h5dsm_attr_open.c @@ -3,13 +3,13 @@ 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; (void)MPI_Init(&argc, &argv); - 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)) @@ -28,8 +28,8 @@ int main(int argc, char *argv[]) { ERROR; /* Open snapshot if specified */ - if(argc == 7) { - snap_id = (H5VL_daosm_snap_id_t)atoi(argv[6]); + if(argc == 6) { + snap_id = (H5VL_daosm_snap_id_t)atoi(argv[5]); printf("Opening snapshot %llu\n", (long long unsigned)snap_id); if(H5Pset_daosm_snap_open(fapl, snap_id) < 0) ERROR; @@ -39,29 +39,15 @@ int main(int argc, char *argv[]) { if((file = H5Fopen(argv[2], H5F_ACC_RDONLY, 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; - } - printf("Opening attribute\n"); /* 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; /* Close */ if(H5Aclose(attr) < 0) ERROR; - if(H5Oclose(obj) < 0) - ERROR; if(H5Fclose(file) < 0) ERROR; if(H5Pclose(fapl) < 0) @@ -75,7 +61,6 @@ int main(int argc, char *argv[]) { error: H5E_BEGIN_TRY { H5Aclose(attr); - H5Oclose(obj); H5Fclose(file); H5Pclose(fapl); } H5E_END_TRY; |