Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into bugfix/repack_external_storage

4 files changed, 27 insertions, 25 deletions

diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index f12c3b4..24f4e6c 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -609,7 +609,7 @@ check_options(pack_opt_t *options)
             if (options->verbose) {
                 HDprintf(" <%s> with chunk size ", name);
                 for (k = 0; k < options->op_tbl->objs[i].chunk.rank; k++)
-                    HDprintf("%d ", (int)options->op_tbl->objs[i].chunk.chunk_lengths[k]);
+                    HDprintf("%d ", (int) options->op_tbl->objs[i].chunk.chunk_lengths[k]);
                 HDprintf("\n");
             }
             has_ck = 1;
@@ -649,9 +649,7 @@ check_options(pack_opt_t *options)
                     break;
                 case H5Z_FILTER_SZIP:
                 case H5Z_FILTER_DEFLATE:
-                    HDprintf(" All with %s, parameter %d\n",
-                            get_sfilter(filtn),
-                            options->filter_g[k].cd_values[0]);
+                    HDprintf(" All with %s, parameter %d\n", get_sfilter(filtn), options->filter_g[k].cd_values[0]);
                     break;
                 default:
                     HDprintf(" User Defined %d\n", filtn);
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 07defa5..398d632 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -921,10 +921,12 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                         H5E_tools_g,
                                         H5E_tools_min_id_g,
                                         "H5Dcreate2 failed");
-                                if (options->verbose)
+                                if (options->verbose) {
                                     HDprintf(" warning: could not create dataset <%s>. Applying original settings\n",
                                             travt->objs[i].name);
-                                dset_out = H5Dcreate2(fidout,
+                                }
+                                dset_out = H5Dcreate2(
+                                        fidout,
                                         travt->objs[i].name,
                                         wtype_id,
                                         f_space_id,
@@ -1127,10 +1129,11 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                 /* print a message that the filter was not applied
                                  * (in case there was a filter)
                                  */
-                                if (has_filter && apply_s == 0)
+                                if (has_filter && apply_s == 0) {
                                     HDprintf(" <warning: filter not applied to %s. dataset smaller than %d bytes>\n",
                                             travt->objs[i].name,
                                             (int) options->min_comp);
+                                }
 
                                 if (has_filter && apply_f == 0)
                                     HDprintf(" <warning: could not apply the filter to %s>\n", travt->objs[i].name);
@@ -1358,7 +1361,7 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
                 {
                     unsigned level = cd_values[0];
 
-                    sprintf(temp,"(%d)", level);
+                    HDsprintf(temp,"(%d)", level);
                     HDstrcat(strfilter, temp);
                 }
 #endif
@@ -1372,7 +1375,7 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
                     unsigned options_mask = cd_values[0]; /* from dcpl, not filt*/
                     unsigned ppb = cd_values[1];
 
-                    sprintf(temp,"(%d,", ppb);
+                    HDsprintf(temp,"(%d,", ppb);
                     HDstrcat(strfilter, temp);
                     if (options_mask & H5_SZIP_EC_OPTION_MASK)
                         HDstrcpy(temp, "EC) ");
@@ -1412,7 +1415,7 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
 
         HDstrcpy(str, "dset     ");
         HDstrcat(str, strfilter);
-        sprintf(temp, "  (%.3f:1)", ratio);
+        HDsprintf(temp, "  (%.3f:1)", ratio);
         HDstrcat(str, temp);
         HDprintf(FORMAT_OBJ, str, objname);
     }
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index a146499..c94a0bd 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -138,7 +138,8 @@ static void usage(const char *prog) {
     PRINTVALSTREAM(rawoutstream, "        0: This is H5F_LIBVER_EARLIEST in H5F_libver_t struct\n");
     PRINTVALSTREAM(rawoutstream, "        1: This is H5F_LIBVER_V18 in H5F_libver_t struct\n");
     PRINTVALSTREAM(rawoutstream, "        2: This is H5F_LIBVER_V110 in H5F_libver_t struct\n");
-    PRINTVALSTREAM(rawoutstream, "           (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V110 for this release\n");
+    PRINTVALSTREAM(rawoutstream, "        3: This is H5F_LIBVER_V112 in H5F_libver_t struct\n");
+    PRINTVALSTREAM(rawoutstream, "           (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V112 for this release\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "    FS_STRATEGY is a string indicating the file space strategy used:\n");
     PRINTVALSTREAM(rawoutstream, "        FSM_AGGR:\n");
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index f5846ba..7e8951f 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -158,7 +158,7 @@ int do_copy_refobjs(hid_t fidin,
                         if(nelmts) {
                             buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if(buf==NULL) {
-                                printf("cannot read into memory\n" );
+                                HDprintf("cannot read into memory\n" );
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                             } /* end if */
                             if(H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
@@ -166,7 +166,7 @@ int do_copy_refobjs(hid_t fidin,
 
                             refbuf = (hobj_ref_t*) HDcalloc((unsigned)nelmts, msize);
                             if(refbuf == NULL){
-                                printf("cannot allocate memory\n" );
+                                HDprintf("cannot allocate memory\n" );
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                             } /* end if */
                             for(u = 0; u < nelmts; u++) {
@@ -183,8 +183,8 @@ int do_copy_refobjs(hid_t fidin,
                                     if(H5Rcreate(&refbuf[u], fidout, refname, H5R_OBJECT, (hid_t)-1) < 0)
                                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Rcreate failed");
                                     if(options->verbose) {
-                                        printf(FORMAT_OBJ,"dset",travt->objs[i].name );
-                                        printf("object <%s> object reference created to <%s>\n",
+                                        HDprintf(FORMAT_OBJ,"dset",travt->objs[i].name );
+                                        HDprintf("object <%s> object reference created to <%s>\n",
                                             travt->objs[i].name,
                                             refname);
                                     }
@@ -234,7 +234,7 @@ int do_copy_refobjs(hid_t fidin,
                         if(nelmts) {
                             buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if(buf == NULL) {
-                                printf("cannot read into memory\n");
+                                HDprintf("cannot read into memory\n");
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                             } /* end if */
                             if(H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
@@ -246,7 +246,7 @@ int do_copy_refobjs(hid_t fidin,
                              */
                             refbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)nelmts); /*init to zero */
                             if(refbuf == NULL) {
-                                printf("cannot allocate memory\n");
+                                HDprintf("cannot allocate memory\n");
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                             } /* end if */
 
@@ -271,8 +271,8 @@ int do_copy_refobjs(hid_t fidin,
                                     if(H5Sclose(region_id) < 0)
                                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sclose failed");
                                     if(options->verbose) {
-                                        printf(FORMAT_OBJ,"dset",travt->objs[i].name );
-                                        printf("object <%s> region reference created to <%s>\n",
+                                        HDprintf(FORMAT_OBJ,"dset",travt->objs[i].name );
+                                        HDprintf("object <%s> region reference created to <%s>\n",
                                             travt->objs[i].name,
                                             refname);
                                     }
@@ -590,7 +590,7 @@ static int copy_refs_attr(hid_t loc_in,
             if((is_ref || is_ref_array) && (H5R_OBJ_REF_BUF_SIZE==msize)) {
                 buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                 if(buf == NULL) {
-                    printf("cannot read into memory\n");
+                    HDprintf("cannot read into memory\n");
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
                 if(H5Aread(attr_id, mtype_id, buf) < 0)
@@ -598,7 +598,7 @@ static int copy_refs_attr(hid_t loc_in,
 
                 refbuf = (hobj_ref_t *)HDcalloc((unsigned)nelmts, msize);
                 if(refbuf == NULL) {
-                    printf("cannot allocate memory\n");
+                    HDprintf("cannot allocate memory\n");
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                 } /* end if */
 
@@ -611,7 +611,7 @@ static int copy_refs_attr(hid_t loc_in,
                 buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize));
 
                 if(buf == NULL) {
-                    printf( "cannot read into memory\n" );
+                    HDprintf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
                 if(H5Aread(attr_id, mtype_id, buf) < 0)
@@ -623,7 +623,7 @@ static int copy_refs_attr(hid_t loc_in,
                  */
                 refbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)nelmts); /*init to zero */
                 if(refbuf == NULL) {
-                    printf( "cannot allocate memory\n" );
+                    HDprintf( "cannot allocate memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                 } /* end if */
 
@@ -638,7 +638,7 @@ static int copy_refs_attr(hid_t loc_in,
                 refbuf = buf; /* reuse the read buffer for write */
 
                 if(buf == NULL) {
-                    printf( "cannot read into memory\n" );
+                    HDprintf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
 
@@ -679,7 +679,7 @@ static int copy_refs_attr(hid_t loc_in,
                 refbuf = buf; /* reuse the read buffer for write */
 
                 if(buf == NULL) {
-                    printf( "cannot read into memory\n" );
+                    HDprintf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */