summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2003-05-06 03:29:39 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2003-05-06 03:29:39 (GMT)
commit180b83bbbe289744a8ed2c27a67fdaa3ffd923b0 (patch)
treeca7dcbd9c150393549c6c64b39d55ae4ac2ccb86
parente18c55651901ddbfaef28dbcc377446a24730b1c (diff)
downloadhdf5-180b83bbbe289744a8ed2c27a67fdaa3ffd923b0.zip
hdf5-180b83bbbe289744a8ed2c27a67fdaa3ffd923b0.tar.gz
hdf5-180b83bbbe289744a8ed2c27a67fdaa3ffd923b0.tar.bz2
[svn-r6801] Purpose:
h5diff update Description: removed the -l , list, option this feature will be part of a different tool Solution: Platforms tested: Windows 2000 (octopus) Linux 2.4 (rockaway) SunOS 5.7 (arabica) IRIX 6.5 (modi4) Misc. update:
-rw-r--r--tools/h5diff/h5diff.c27
-rwxr-xr-xtools/h5diff/testh5diff.sh3
-rw-r--r--tools/testfiles/h5diff_01.txt1
-rw-r--r--tools/testfiles/h5diff_02.txt1
-rw-r--r--tools/testfiles/h5diff_031.txt1
-rw-r--r--tools/testfiles/h5diff_041.txt1
-rw-r--r--tools/testfiles/h5diff_042.txt1
-rw-r--r--tools/testfiles/h5diff_043.txt1
-rw-r--r--tools/testfiles/h5diff_044.txt1
-rw-r--r--tools/testfiles/h5diff_045.txt1
-rw-r--r--tools/testfiles/h5diff_051.txt1
-rw-r--r--tools/testfiles/h5diff_052.txt1
-rw-r--r--tools/testfiles/h5diff_053.txt1
-rw-r--r--tools/testfiles/h5diff_054.txt1
-rw-r--r--tools/testfiles/h5diff_055.txt1
-rw-r--r--tools/testfiles/h5diff_061.txt1
-rw-r--r--tools/testfiles/h5diff_0610.txt1
-rw-r--r--tools/testfiles/h5diff_062.txt1
-rw-r--r--tools/testfiles/h5diff_063.txt1
-rw-r--r--tools/testfiles/h5diff_064.txt1
-rw-r--r--tools/testfiles/h5diff_065.txt1
21 files changed, 2 insertions, 47 deletions
diff --git a/tools/h5diff/h5diff.c b/tools/h5diff/h5diff.c
index 0d5f587..eb848d6 100644
--- a/tools/h5diff/h5diff.c
+++ b/tools/h5diff/h5diff.c
@@ -28,7 +28,6 @@
typedef struct options_t
{
- int l_; /* list */
int r_; /* report only what objects differ */
int d_; /* delta difference */
double d_delta; /* delta value */
@@ -75,16 +74,7 @@ int check_f_input( const char* );
int get_index( const char *obj, int nobjects, info_t *info );
int compare_object( char *obj1, char *obj2 );
void usage(void);
-void leave();
-
-
-
-/* diff tst*/
-int do_test_files(void);
-int write_dataset( hid_t file_id, int rank, hsize_t *dims, const char *dset_name,
- hid_t type_id, void *data );
-
-
+void leave(void);
/*-------------------------------------------------------------------------
@@ -110,7 +100,6 @@ void usage(void)
printf("file2_name File name of the second HDF5 file\n");
printf("[OPTIONS] are:\n");
printf("[-h ] Print out this information\n");
- printf("[-l ] List contents of file\n");
printf("[-r ] Print only what objects differ\n");
printf("[-n count] Print difference up to count number for each variable\n");
printf("[-d delta] Print difference when it is greater than limit delta\n");
@@ -126,7 +115,7 @@ void usage(void)
*
*-------------------------------------------------------------------------
*/
-void leave()
+void leave(void)
{
exit(EXIT_SUCCESS);
printf("\n");
@@ -213,9 +202,6 @@ int main(int argc, const char *argv[])
case 'h':
usage();
leave();
- case 'l':
- options.l_ = 1;
- break;
case 'r':
options.r_ = 1;
break;
@@ -354,15 +340,6 @@ int main(int argc, const char *argv[])
H5get_object_info( file1_id, info1 );
H5get_object_info( file2_id, info2 );
- if ( options.l_ )
- {
- list ( file1_name, nobjects1, info1 );
- list ( file2_name, nobjects2, info2 );
- printf("\n");
- }
-
-
-
/*-------------------------------------------------------------------------
* object name was supplied
*-------------------------------------------------------------------------
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 8ce28d3..97025d5 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -103,9 +103,6 @@ TOOLTEST h5diff_02.txt -x h5diff_test1.h5 h5diff_test2.h5
# test 0.3.1: Check for -h option
TOOLTEST h5diff_031.txt -h h5diff_test1.h5 h5diff_test2.h5
-# test 0.3.2: Check for -l option
-TOOLTEST h5diff_032.txt -l h5diff_test1.h5 h5diff_test2.h5
-
# test 0.3.3: Check for -r option
TOOLTEST h5diff_033.txt -r h5diff_test1.h5 h5diff_test2.h5
diff --git a/tools/testfiles/h5diff_01.txt b/tools/testfiles/h5diff_01.txt
index a17fd15..84dce54 100644
--- a/tools/testfiles/h5diff_01.txt
+++ b/tools/testfiles/h5diff_01.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_02.txt b/tools/testfiles/h5diff_02.txt
index 3e43b23..3dab1ef 100644
--- a/tools/testfiles/h5diff_02.txt
+++ b/tools/testfiles/h5diff_02.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_031.txt b/tools/testfiles/h5diff_031.txt
index 930bad5..789fe25 100644
--- a/tools/testfiles/h5diff_031.txt
+++ b/tools/testfiles/h5diff_031.txt
@@ -10,7 +10,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_041.txt b/tools/testfiles/h5diff_041.txt
index 1aae7b0..806f9c5 100644
--- a/tools/testfiles/h5diff_041.txt
+++ b/tools/testfiles/h5diff_041.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_042.txt b/tools/testfiles/h5diff_042.txt
index 819373f..de5e713 100644
--- a/tools/testfiles/h5diff_042.txt
+++ b/tools/testfiles/h5diff_042.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_043.txt b/tools/testfiles/h5diff_043.txt
index 135b16f..748f7a0 100644
--- a/tools/testfiles/h5diff_043.txt
+++ b/tools/testfiles/h5diff_043.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_044.txt b/tools/testfiles/h5diff_044.txt
index 3a76d2f..b034418 100644
--- a/tools/testfiles/h5diff_044.txt
+++ b/tools/testfiles/h5diff_044.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_045.txt b/tools/testfiles/h5diff_045.txt
index 629ab09..169a908 100644
--- a/tools/testfiles/h5diff_045.txt
+++ b/tools/testfiles/h5diff_045.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_051.txt b/tools/testfiles/h5diff_051.txt
index a9edb90..3bba57b 100644
--- a/tools/testfiles/h5diff_051.txt
+++ b/tools/testfiles/h5diff_051.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_052.txt b/tools/testfiles/h5diff_052.txt
index 1ac0dc5..5b44166 100644
--- a/tools/testfiles/h5diff_052.txt
+++ b/tools/testfiles/h5diff_052.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_053.txt b/tools/testfiles/h5diff_053.txt
index 2581223..a51d0b3 100644
--- a/tools/testfiles/h5diff_053.txt
+++ b/tools/testfiles/h5diff_053.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_054.txt b/tools/testfiles/h5diff_054.txt
index f7acc60..96129ce 100644
--- a/tools/testfiles/h5diff_054.txt
+++ b/tools/testfiles/h5diff_054.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_055.txt b/tools/testfiles/h5diff_055.txt
index 53cfaf4..18e3890 100644
--- a/tools/testfiles/h5diff_055.txt
+++ b/tools/testfiles/h5diff_055.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_061.txt b/tools/testfiles/h5diff_061.txt
index 53fdaa6..a8ed80a 100644
--- a/tools/testfiles/h5diff_061.txt
+++ b/tools/testfiles/h5diff_061.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_0610.txt b/tools/testfiles/h5diff_0610.txt
index 9e0a31e..43ac12e 100644
--- a/tools/testfiles/h5diff_0610.txt
+++ b/tools/testfiles/h5diff_0610.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_062.txt b/tools/testfiles/h5diff_062.txt
index ff78a95..5d49586 100644
--- a/tools/testfiles/h5diff_062.txt
+++ b/tools/testfiles/h5diff_062.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_063.txt b/tools/testfiles/h5diff_063.txt
index 1e8fdc5..e9cd333 100644
--- a/tools/testfiles/h5diff_063.txt
+++ b/tools/testfiles/h5diff_063.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_064.txt b/tools/testfiles/h5diff_064.txt
index 0067ac4..0386311 100644
--- a/tools/testfiles/h5diff_064.txt
+++ b/tools/testfiles/h5diff_064.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta
diff --git a/tools/testfiles/h5diff_065.txt b/tools/testfiles/h5diff_065.txt
index cb2909e..2f0eb34 100644
--- a/tools/testfiles/h5diff_065.txt
+++ b/tools/testfiles/h5diff_065.txt
@@ -11,7 +11,6 @@ file1_name File name of the first HDF5 file
file2_name File name of the second HDF5 file
[OPTIONS] are:
[-h ] Print out this information
-[-l ] List contents of file
[-r ] Print only what objects differ
[-n count] Print difference up to count number for each variable
[-d delta] Print difference when it is greater than limit delta