[svn-r14104] Description:

	Pursue calls to H5Gcreate() relentlessly and ruthlessly exterminate
them, leaving only a few tame specimens in text files and comments.  ;-)

Tested on:
	Mac OS X/32 10.4.10 (amazon)
	FreeBSD/32 6.2 (duty)
	FreeBSD/64 6.2 (liberty)
	Linux/32 2.6 (kagiso)
	Linux/64 2.6 (smirom)
	Solaris/32 5.10 (linew)

1 files changed, 27 insertions, 36 deletions

diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index cd99ce0..b494a67 100755
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -848,17 +848,14 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id)
     {
         
         /* create parent groups */
-        if (in->path.count > 1)
-        {
+        if(in->path.count > 1) {
             j = 0;
             handle = file_id;
-            while (j<in->path.count-1)
-            {
-                if ((group_id = H5Gopen(handle, in->path.group[j])) < 0)
-                {
-                    group_id = H5Gcreate(handle, in->path.group[j++], 0);
-                    for (; j<in->path.count-1; j++)
-                        group_id = H5Gcreate(group_id, in->path.group[j], 0);
+            while(j < in->path.count - 1) {
+                if((group_id = H5Gopen(handle, in->path.group[j])) < 0) {
+                    group_id = H5Gcreate2(handle, in->path.group[j++], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+                    for(; j < in->path.count - 1; j++)
+                        group_id = H5Gcreate2(group_id, in->path.group[j], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
                     handle = group_id;
                     break;
                 }
@@ -866,10 +863,9 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id)
                 j++;
             }
         }
-        else
-        {
+        else {
             handle = file_id;
-            j=0;
+            j = 0;
         }
         
         /*enable error reporting */
@@ -2443,31 +2439,26 @@ process(struct Options *opt)
 
     /* disable error reporting */
     H5E_BEGIN_TRY {
-
-    /* create parent groups */
-    if (in->path.count > 1)
-    {
-      j = 0;
-      handle = file_id;
-      while (j<in->path.count-1)
-      {
-        if ((group_id = H5Gopen(handle, in->path.group[j])) < 0)
-        {
-          group_id = H5Gcreate(handle, in->path.group[j++], 0);
-          for (; j<in->path.count-1; j++)
-            group_id = H5Gcreate(group_id, in->path.group[j], 0);
-          handle = group_id;
-          break;
+        /* create parent groups */
+        if(in->path.count > 1) {
+            j = 0;
+            handle = file_id;
+            while(j < in->path.count - 1) {
+                if((group_id = H5Gopen(handle, in->path.group[j])) < 0) {
+                  group_id = H5Gcreate2(handle, in->path.group[j++], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+                  for (; j < in->path.count - 1; j++)
+                    group_id = H5Gcreate2(group_id, in->path.group[j], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+                  handle = group_id;
+                  break;
+                }
+                handle = group_id;
+                j++;
+            }
+        }
+        else {
+          handle = file_id;
+          j=0;
         }
-        handle = group_id;
-        j++;
-      }
-    }
-    else
-    {
-      handle = file_id;
-      j=0;
-    }
 
     /*enable error reporting */
     } H5E_END_TRY;