[svn-r19182] Description:

    Bring r19179 from trunk to 1.8 branch:

Bring changes from Coverity branch back to trunk:

r19079 & 19080:
[BZ1942]  h5dump -u to generate XML, it does not respect the -m option

xml version of dump_data function didn't check for use of fp_format variable.

Added new test expected file for committed bug 1942

r19103, 19104 & 19105:
[BZ1821] h5repack -v did not display correct output for a selected compression. Needed new test for comparing output of -v option.

Added new test file for solution to BZ1821

BZ1821 - Bring test changes from the shell script actually used.

Tested on:
    Mac OS X/32 10.6.4 (amazon) debug & production
    (h5committested on branch)

1 files changed, 6 insertions, 10 deletions

diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index b4c191c..ece870f 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -642,19 +642,15 @@ int do_copy_objects(hid_t fidin,
                 req_filter = 1;
 
             /* check if filters were requested for individual objects */
-            for( u = 0; u < options->op_tbl->nelems; u++)
-            {
+            for (u = 0; u < options->op_tbl->nelems; u++) {
                 int k;
 
-                for( k = 0; k < options->op_tbl->objs[u].nfilters; k++)
-                {
-                    if ( options->op_tbl->objs[u].filter->filtn > 0 )
-                    {
-
-                        req_filter = 1;
-
+                if (strcmp(travt->objs[i].name, options->op_tbl->objs[u].path) == 0) {
+                    for (k = 0; k < options->op_tbl->objs[u].nfilters; k++) {
+                        if (options->op_tbl->objs[u].filter->filtn > 0) {
+                            req_filter = 1;
+                        }
                     }
-
                 }
             }