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.

1 files changed, 5 insertions, 20 deletions

diff --git a/examples/h5dsm_attr_create.c b/examples/h5dsm_attr_create.c
index d4281b4..50a9acf 100644
--- a/examples/h5dsm_attr_create.c
+++ b/examples/h5dsm_attr_create.c
@@ -3,14 +3,14 @@
 int main(int argc, char *argv[]) {
     uuid_t pool_uuid;
     char *pool_grp = NULL;
-    hid_t file = -1, obj = -1, attr = -1, space = -1, fapl = -1;
+    hid_t file = -1, attr = -1, space = -1, fapl = -1;
     hsize_t dims[2] = {4, 6};
     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))
@@ -36,26 +36,14 @@ 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;
-    }
-
     printf("Creating attribute\n");
 
     /* Create attribute */
-    if((attr = H5Acreate2(obj, argv[5], H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if((attr = H5Acreate_by_name(file, argv[3], argv[4], H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         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);
@@ -64,8 +52,6 @@ int main(int argc, char *argv[]) {
     /* Close */
     if(H5Aclose(attr) < 0)
         ERROR;
-    if(H5Oclose(obj) < 0)
-        ERROR;
     if(H5Fclose(file) < 0)
         ERROR;
     if(H5Sclose(space) < 0)
@@ -81,7 +67,6 @@ int main(int argc, char *argv[]) {
 error:
     H5E_BEGIN_TRY {
         H5Aclose(attr);
-        H5Oclose(obj);
         H5Fclose(file);
         H5Sclose(space);
         H5Pclose(fapl);