[svn-r7785] Purpose:

h5repack new features


Description:
added a copy routine for all types
added a copy routine for attributes
commnented some debug messages in h5trav
added the verbose option to some h5diff messages


Platforms tested:
linux
solaris 2.5
IRIX


Misc. update:

2 files changed, 38 insertions, 33 deletions

diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 72b09a9..206e5de 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -19,7 +19,7 @@
 /* Due to alignment issue in Alpha clusters, options must be declared here
  * not as a local variable in main().
  */
-diff_opt_t  options = {0,0,0,0,0,0,0,1};
+diff_opt_t  options = {0,0,0,0,0,0,0,0};
 
 static void usage(void);
 static int check_n_input( const char* );
@@ -112,6 +112,10 @@ int main(int argc, const char *argv[])
     break;
     case 'h': 
      usage();
+     break;
+    case 'v': 
+     options.verbose = 1;
+     break;
     case 'r': 
      options.r = 1;
      break;
@@ -185,7 +189,7 @@ int main(int argc, const char *argv[])
  }/*for*/
  
 
- nfound = h5diff(fname1,fname2,objname1,objname2,options);
+ nfound = h5diff(fname1,fname2,objname1,objname2,&options);
  printf("\n");
  ret= (nfound==0 ? 0 : 1 );
  return ret;
@@ -295,6 +299,7 @@ void usage(void)
  printf("[obj2]            Name of an HDF5 object, in absolute path\n");
  printf("[OPTIONS] are:\n");
  printf("[-h]              Print out this information\n");
+ printf("[-v]              Verbose mode\n");
  printf("[-r]              Print only what objects differ, not the differences\n");
  printf("[-n count]        Print difference up to count number\n");
  printf("[-d delta]        Print difference when it is greater than limit delta\n");
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 47095f1..59d52cd 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -103,19 +103,19 @@ TOOLTEST() {
 TOOLTEST h5diff_10.txt -h
 
 # 1.1
-TOOLTEST h5diff_11.txt file6.h5 file6.h5 dset3a dset3b
+TOOLTEST h5diff_11.txt file6.h5 file6.h5 -v  dset3a dset3b
 
 # 1.2
-TOOLTEST h5diff_12.txt file1.h5 file2.h5 -n 2 g1/dset1 g1/dset2
+TOOLTEST h5diff_12.txt file1.h5 file2.h5 -v -n 2 g1/dset1 g1/dset2
 
 # 1.3
-TOOLTEST h5diff_13.txt file1.h5 file2.h5 -d 5 g1/dset3 g1/dset4
+TOOLTEST h5diff_13.txt file1.h5 file2.h5 -v -d 5 g1/dset3 g1/dset4
 
 # 1.4
-TOOLTEST h5diff_14.txt file1.h5 file2.h5 -p 0.05 g1/dset3 g1/dset4
+TOOLTEST h5diff_14.txt file1.h5 file2.h5 -v -p 0.05 g1/dset3 g1/dset4
 
 # 1.5
-TOOLTEST h5diff_15.txt file1.h5 file2.h5 -r g1/dset1 g1/dset2
+TOOLTEST h5diff_15.txt file1.h5 file2.h5 -v -r g1/dset1 g1/dset2
 
 # 1.6
 TOOLTEST h5diff_16.txt file6.h5 file6.h5 
@@ -125,22 +125,22 @@ TOOLTEST h5diff_16.txt file6.h5 file6.h5
 # ##############################################################################
 
 # 2.0
-TOOLTEST h5diff_20.txt file3.h5 file3.h5 dset group
+TOOLTEST h5diff_20.txt file3.h5 file3.h5 -v dset group
 
 # 2.1
-TOOLTEST h5diff_21.txt file3.h5 file3.h5 dset link
+TOOLTEST h5diff_21.txt file3.h5 file3.h5 -v dset link
 
 # 2.2
-TOOLTEST h5diff_22.txt file3.h5 file3.h5 dset type
+TOOLTEST h5diff_22.txt file3.h5 file3.h5 -v dset type
 
 # 2.3
-TOOLTEST h5diff_23.txt file3.h5 file3.h5 group group
+TOOLTEST h5diff_23.txt file3.h5 file3.h5 -v group group
 
 # 2.4
-TOOLTEST h5diff_24.txt file3.h5 file3.h5 type type
+TOOLTEST h5diff_24.txt file3.h5 file3.h5 -v type type
 
 # 2.5
-TOOLTEST h5diff_25.txt file3.h5 file3.h5 link link
+TOOLTEST h5diff_25.txt file3.h5 file3.h5 -v link link
 
 # ##############################################################################
 # # Class issues
@@ -148,44 +148,44 @@ TOOLTEST h5diff_25.txt file3.h5 file3.h5 link link
 
 
 # 3.0
-TOOLTEST h5diff_30.txt file4.h5 file4.h5 string 
+TOOLTEST h5diff_30.txt file4.h5 file4.h5 -v string 
 
 # 3.1
-TOOLTEST h5diff_31.txt file4.h5 file4.h5 bitfield 
+TOOLTEST h5diff_31.txt file4.h5 file4.h5 -v bitfield 
 
 # 3.2
-TOOLTEST h5diff_32.txt file4.h5 file4.h5 opaque
+TOOLTEST h5diff_32.txt file4.h5 file4.h5 -v opaque
 
 # 3.3
-TOOLTEST h5diff_33.txt file4.h5 file4.h5 compound
+TOOLTEST h5diff_33.txt file4.h5 file4.h5 -v compound
 
 # 3.4
-TOOLTEST h5diff_34.txt file4.h5 file4.h5 ref
+TOOLTEST h5diff_34.txt file4.h5 file4.h5 -v ref
 
 # 3.5
-TOOLTEST h5diff_35.txt file4.h5 file4.h5 enum
+TOOLTEST h5diff_35.txt file4.h5 file4.h5 -v enum
 
 # 3.6
-TOOLTEST h5diff_36.txt file4.h5 file4.h5 vlen
+TOOLTEST h5diff_36.txt file4.h5 file4.h5 -v vlen
 
 # 3.7
-TOOLTEST h5diff_37.txt file4.h5 file4.h5 array
+TOOLTEST h5diff_37.txt file4.h5 file4.h5 -v array
 
 # 3.8
-TOOLTEST h5diff_38.txt file4.h5 file4.h5 integer float
+TOOLTEST h5diff_38.txt file4.h5 file4.h5 -v integer float
 
 # ##############################################################################
 # # Dimensions
 # ##############################################################################
 
 # 4.0
-TOOLTEST h5diff_40.txt file5.h5 file5.h5 dset1 dset2
+TOOLTEST h5diff_40.txt file5.h5 file5.h5 -v dset1 dset2
 
 # 4.1
-TOOLTEST h5diff_41.txt file5.h5 file5.h5 dset3 dset4
+TOOLTEST h5diff_41.txt file5.h5 file5.h5 -v dset3 dset4
 
 # 4.2
-TOOLTEST h5diff_42.txt file5.h5 file5.h5 dset5 dset6
+TOOLTEST h5diff_42.txt file5.h5 file5.h5 -v dset5 dset6
 
 
 # ##############################################################################
@@ -193,28 +193,28 @@ TOOLTEST h5diff_42.txt file5.h5 file5.h5 dset5 dset6
 # ##############################################################################
 
 # 5.0
-TOOLTEST h5diff_50.txt file6.h5 file6.h5 dset0a dset0b
+TOOLTEST h5diff_50.txt file6.h5 file6.h5 -v dset0a dset0b
 
 # 5.1
-TOOLTEST h5diff_51.txt file6.h5 file6.h5 dset1a dset1b
+TOOLTEST h5diff_51.txt file6.h5 file6.h5 -v dset1a dset1b
 
 # 5.2
-TOOLTEST h5diff_52.txt file6.h5 file6.h5 dset2a dset2b
+TOOLTEST h5diff_52.txt file6.h5 file6.h5 -v dset2a dset2b
 
 # 5.3
-TOOLTEST h5diff_53.txt file6.h5 file6.h5 dset3a dset4b
+TOOLTEST h5diff_53.txt file6.h5 file6.h5 -v dset3a dset4b
 
 # 5.4
-TOOLTEST h5diff_54.txt file6.h5 file6.h5 dset4a dset4b
+TOOLTEST h5diff_54.txt file6.h5 file6.h5 -v dset4a dset4b
 
 # 5.5
-TOOLTEST h5diff_55.txt file6.h5 file6.h5 dset5a dset5b
+TOOLTEST h5diff_55.txt file6.h5 file6.h5 -v dset5a dset5b
 
 # 5.6
-TOOLTEST h5diff_56.txt file6.h5 file6.h5 dset6a dset6b
+TOOLTEST h5diff_56.txt file6.h5 file6.h5 -v dset6a dset6b
 
 # 5.7
-TOOLTEST h5diff_57.txt file6.h5 file6.h5 dset7a dset7b
+TOOLTEST h5diff_57.txt file6.h5 file6.h5 -v dset7a dset7b
 
 # 5.8 long_long test; different format of long_long print  in Linux and IRIX
 #TOOLTEST h5diff_58.txt file6.h5 file6.h5 dset8a dset8b