diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2010-09-16 18:09:59 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2010-09-16 18:09:59 (GMT) |
| commit | a9a3f22e786983ec4e946bd1a8cdd42ec8058c53 (patch) | |
| tree | d144bfe7cf780f925535a2466ce37059e6917123 /tools/h5diff/ph5diff_main.c | |
| parent | 9f028ea4589cfd21ce610050c75895ed69b2ee08 (diff) | |
| download | hdf5-a9a3f22e786983ec4e946bd1a8cdd42ec8058c53.zip hdf5-a9a3f22e786983ec4e946bd1a8cdd42ec8058c53.tar.gz hdf5-a9a3f22e786983ec4e946bd1a8cdd42ec8058c53.tar.bz2 | |
[svn-r19401] Purpose:
Fix for Bug1975 h5diff - support recursive comparison on group when specified as an object
Description:
Merged from hdf5 trunk (r19400).
Compare member objects and groups recursively when two files or groups are specified to be compared. Support parallel diff and handling symbolic links accordingly.
Tested:
jam, amani
Diffstat (limited to 'tools/h5diff/ph5diff_main.c')
| -rw-r--r-- | tools/h5diff/ph5diff_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/h5diff/ph5diff_main.c b/tools/h5diff/ph5diff_main.c index 531503d..f6b0dba 100644 --- a/tools/h5diff/ph5diff_main.c +++ b/tools/h5diff/ph5diff_main.c @@ -135,7 +135,7 @@ ph5diff_worker(int nID) { struct diff_args args; hid_t file1_id, file2_id; - char filenames[2][1024]; + char filenames[2][MAX_FILENAME]; char out_data[PRINT_DATA_MAX_SIZE] = {0}; struct diffs_found diffs; int i; @@ -144,7 +144,7 @@ ph5diff_worker(int nID) MPI_Comm_rank(MPI_COMM_WORLD, &nID); outBuffOffset = 0; - MPI_Recv(filenames, 1024*2, MPI_CHAR, 0, MPI_ANY_TAG, MPI_COMM_WORLD, &Status); + MPI_Recv(filenames, MAX_FILENAME*2, MPI_CHAR, 0, MPI_ANY_TAG, MPI_COMM_WORLD, &Status); if(Status.MPI_TAG == MPI_TAG_PARALLEL) { /* disable error reporting */ @@ -175,7 +175,7 @@ ph5diff_worker(int nID) /*Recv parameters for diff from manager task */ MPI_Recv(&args, sizeof(args), MPI_BYTE, 0, MPI_TAG_ARGS, MPI_COMM_WORLD, &Status); /*Do the diff */ - diffs.nfound = diff(file1_id, args.name, file2_id, args.name, &(args.options), args.type); + diffs.nfound = diff(file1_id, args.name1, file2_id, args.name2, &(args.options), args.type); diffs.not_cmp = args.options.not_cmp; /*If print buffer has something in it, request print token.*/ |