Merge/align with trunk

1 files changed, 86 insertions, 114 deletions

diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index f49e587..d0b182c 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -1536,15 +1536,15 @@ int main (void)
     {
         hid_t       fapl;
 
-        /* setup */
-        h5_reset();
         fapl = h5_fileaccess();
-        h5_cleanup(H5REPACK_FILENAMES, fapl);
+        h5_clean_files(H5REPACK_FILENAMES, fapl);
 
     }
 
     puts("All h5repack tests passed.");
 
+    h5tools_close();
+
     return 0;
 
 error:
@@ -3361,7 +3361,7 @@ make_userblock(void)
 
     /* Initialize userblock data */
     for(u = 0; u < USERBLOCK_SIZE; u++)
-        ub[u] = 'a' + (char)(u % 26);
+        ub[u] = (char)('a' + (char)(u % 26));
 
     /* Re-open HDF5 file, as "plain" file */
     if((fd = HDopen(FNAME16, O_WRONLY, 0644)) < 0)
@@ -3474,7 +3474,7 @@ make_userblock_file(void)
 
     /* initialize userblock data */
     for(u = 0; u < USERBLOCK_SIZE; u++)
-        ub[u] = 'a' + (char)(u % 26);
+        ub[u] = (char)('a' + (char)(u % 26));
 
     /* open file */
     if((fd = HDopen(FNAME_UB,O_WRONLY|O_CREAT|O_TRUNC, 0644 )) < 0)
@@ -3531,7 +3531,8 @@ int write_dset_in(hid_t loc_id,
     hid_t   sid=-1;
     hid_t   tid=-1;
     hid_t   pid=-1;
-    int     val, i, j, k, n;
+    unsigned i, j;
+    int     val, k, n;
     float   f;
 
     /* create 1D attributes with dimension [2], 2 elements */
@@ -3586,13 +3587,10 @@ int write_dset_in(hid_t loc_id,
     */
 
 
-    if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            for (j=0; j<2; j++)
-            {
-                buf1[i][j]='z';
-            }
+    if(make_diffs) {
+        for(i = 0; i < 2; i++)
+            for(j = 0; j < 2; j++)
+                buf1[i][j] = 'z';
     }
 
 
@@ -3615,10 +3613,9 @@ int write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            buf2[i]=buf2[1]=0;
+    if(make_diffs) {
+        for(i = 0; i < 2; i++)
+            buf2[i] = buf2[1] = 0;
     }
 
     if ((tid = H5Tcopy(H5T_STD_B8LE)) < 0)
@@ -3633,11 +3630,10 @@ int write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf3[i].a=0; buf3[i].b=0;
+    if(make_diffs) {
+        for(i = 0; i < 2; i++) {
+            buf3[i].a = 0;
+            buf3[i].b = 0;
         }
     }
 
@@ -3656,12 +3652,9 @@ int write_dset_in(hid_t loc_id,
     */
 
 
-    if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf45[i]=GREEN;
-        }
+    if(make_diffs) {
+        for(i = 0; i < 2; i++)
+            buf45[i] = GREEN;
     }
 
     if ((tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t))) < 0)
@@ -3753,13 +3746,10 @@ int write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            for (j=0; j<3; j++)
-            {
-                buf6[i][j]=0;
-            }
+    if(make_diffs) {
+        for(i = 0; i < 2; i++)
+            for(j = 0; j < 3; j++)
+                buf6[i][j] = 0;
     }
 
     if ((tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray)) < 0)
@@ -3820,12 +3810,10 @@ int write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf7[i]=0;
-            buf8[i]=0;
+    if(make_diffs) {
+        for(i = 0; i < 2; i++) {
+            buf7[i] = 0;
+            buf8[i] = 0;
         }
     }
 
@@ -3948,16 +3936,13 @@ int write_dset_in(hid_t loc_id,
 
     /* Allocate and initialize VL dataset to write */
     n = 0;
-    for(i = 0; i < 3; i++)
-    {
-        for(j = 0; j < 2; j++)
-        {
-            int l;
+    for(i = 0; i < 3; i++) {
+        for(j = 0; j < 2; j++) {
+            unsigned l;
 
             buf52[i][j].p = HDmalloc((i + 1) * sizeof(int));
             buf52[i][j].len = (size_t)(i + 1);
-            for(l = 0; l < i + 1; l++)
-            {
+            for(l = 0; l < i + 1; l++) {
                 if(make_diffs)
                     ((int *)buf52[i][j].p)[l] = 0;
                 else
@@ -4068,11 +4053,13 @@ int write_dset_in(hid_t loc_id,
 
 
     n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
-            for (k = 0; k < 2; k++) {
-                if (make_diffs) buf23[i][j][k]=0;
-                else buf23[i][j][k]=n++;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                if(make_diffs)
+                    buf23[i][j][k] = 0;
+                else 
+                    buf23[i][j][k] = (char)(n++);
             }
         }
     }
@@ -4104,16 +4091,16 @@ int write_dset_in(hid_t loc_id,
     */
 
     n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
-            for (k = 0; k < 2; k++) {
-                if (make_diffs) {
-                    buf33[i][j][k].a=0;
-                    buf33[i][j][k].b=0;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                if(make_diffs) {
+                    buf33[i][j][k].a = 0;
+                    buf33[i][j][k].b = 0;
                 }
                 else {
-                    buf33[i][j][k].a=n++;
-                    buf33[i][j][k].b=n++;
+                    buf33[i][j][k].a = (char)(n++);
+                    buf33[i][j][k].b = n++;
                 }
             }
         }
@@ -4167,18 +4154,14 @@ int write_dset_in(hid_t loc_id,
 
     /* Allocate and initialize VL dataset to write */
     n = 0;
-    for(i = 0; i < 4; i++)
-    {
-        for(j = 0; j < 3; j++)
-        {
-            for(k = 0; k < 2; k++)
-            {
-                int l;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                unsigned l;
 
                 buf53[i][j][k].p = HDmalloc((i + 1) * sizeof(int));
                 buf53[i][j][k].len = (size_t)(i + 1);
-                for(l = 0; l < i + 1; l++)
-                {
+                for(l = 0; l < i + 1; l++) {
                     if(make_diffs)
                         ((int *)buf53[i][j][k].p)[l] = 0;
                     else
@@ -4214,10 +4197,8 @@ int write_dset_in(hid_t loc_id,
 
 
     n = 1;
-    for(i = 0; i < 24; i++)
-    {
-        for(j = 0; j < (int)dimarray[0]; j++)
-        {
+    for(i = 0; i < 24; i++) {
+        for(j = 0; j < dimarray[0]; j++) {
             if(make_diffs)
                 buf63[i][j] = 0;
             else
@@ -4256,13 +4237,10 @@ int write_dset_in(hid_t loc_id,
     if (write_dset(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83) < 0)
         goto out;
 
-
     return 0;
 
-
 out:
-    H5E_BEGIN_TRY
-    {
+    H5E_BEGIN_TRY {
         H5Pclose(pid);
         H5Sclose(sid);
         H5Dclose(did);
@@ -4411,7 +4389,8 @@ int write_attr_in(hid_t loc_id,
     hid_t   aid = -1;
     hid_t   sid = -1;
     hid_t   tid = -1;
-    int     val, i, j, k, n;
+    int     val, j, k, n;
+    unsigned i;
     float   f;
 
     /* create 1D attributes with dimension [2], 2 elements */
@@ -4961,16 +4940,17 @@ int write_attr_in(hid_t loc_id,
 
     /* Allocate and initialize VL dataset to write */
     n=0;
-    for (i = 0; i < 3; i++)
-    {
-        for (j = 0; j < 2; j++)
-        {
-            int l;
+    for(i = 0; i < 3; i++) {
+        for(j = 0; j < 2; j++) {
+            unsigned l;
+
             buf52[i][j].p = HDmalloc((i + 1) * sizeof(int));
             buf52[i][j].len = (size_t)(i + 1);
-            for (l = 0; l < i + 1; l++)
-                if (make_diffs)((int *)buf52[i][j].p)[l] = 0;
-                else ((int *)buf52[i][j].p)[l] = n++;
+            for(l = 0; l < i + 1; l++)
+                if(make_diffs)
+                    ((int *)buf52[i][j].p)[l] = 0;
+                else
+                    ((int *)buf52[i][j].p)[l] = n++;
         }
     }
 
@@ -5179,14 +5159,13 @@ int write_attr_in(hid_t loc_id,
     */
 
     n=1;
-    for (i = 0; i < 4; i++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            for (k = 0; k < 2; k++)
-            {
-                if (make_diffs) buf23[i][j][k]=0;
-                else buf23[i][j][k]=n++;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                if(make_diffs)
+                    buf23[i][j][k] = 0;
+                else
+                    buf23[i][j][k] = (char)(n++);
             }
         }
     }
@@ -5248,21 +5227,16 @@ int write_attr_in(hid_t loc_id,
     */
 
     n=1;
-    for (i = 0; i < 4; i++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            for (k = 0; k < 2; k++)
-            {
-                if (make_diffs)
-                {
-                    buf33[i][j][k].a=0;
-                    buf33[i][j][k].b=0;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                if(make_diffs) {
+                    buf33[i][j][k].a = 0;
+                    buf33[i][j][k].b = 0;
                 }
-                else
-                {
-                    buf33[i][j][k].a=n++;
-                    buf33[i][j][k].b=n++;
+                else {
+                    buf33[i][j][k].a = (char)(n++);
+                    buf33[i][j][k].b = n++;
                 }
             }
         }
@@ -5431,14 +5405,13 @@ int write_attr_in(hid_t loc_id,
         {
             for (k = 0; k < 2; k++)
             {
-                int l;
+                unsigned l;
+
                 buf53[i][j][k].p = HDmalloc((i + 1) * sizeof(int));
                 buf53[i][j][k].len = (size_t)i + 1;
                 for (l = 0; l < i + 1; l++)
                     if (make_diffs)
-                    {
                         ((int *)buf53[i][j][k].p)[l] = 0;
-                    }
                     else
                         ((int *)buf53[i][j][k].p)[l] = n++;
             }
@@ -5562,8 +5535,7 @@ int write_attr_in(hid_t loc_id,
     return 0;
 
 out:
-    H5E_BEGIN_TRY
-    {
+    H5E_BEGIN_TRY {
         H5Aclose(aid);
         H5Sclose(sid);
         H5Tclose(tid);