[svn-r22254] Description:

	Bring r22085:22251 from trunk to revise_chunks branch.

	Also tackle some testing issues in test/objcopy.c test and clean up
some warnings.

Tested on:
        FreeBSD/32 8.2 (loyalty) w/gcc4.6, w/C++ & FORTRAN, in debug mode
        FreeBSD/64 8.2 (freedom) w/gcc4.6, w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (koala) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (ostrich) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (ember) w/Intel compilers, w/paralle, C++ & FORTRAN,
                in production mode
        Mac OS X/32 10.7.3 (amazon) in debug mode
        Mac OS X/32 10.7.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.7.3 (amazon) w/parallel, in debug mode

8 files changed, 56 insertions, 0 deletions

diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index f04ed48..d8551ca 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -10,6 +10,9 @@ usage: h5dump [OPTIONS] files
      -e, --escape         Escape non printing characters
      -V, --version        Print version number and exit
      -a P, --attribute=P  Print the specified attribute
+                          If an attribute name contains a slash (/), escape the
+                          slash with a preceding backslash (\).
+                          (See example section below.)
      -d P, --dataset=P    Print the specified dataset
      -y, --noindex        Do not print array indices with the data
      -p, --properties     Print dataset filters, storage layout and fill value
@@ -81,6 +84,10 @@ usage: h5dump [OPTIONS] files
 
       h5dump -a /bar_none/foo quux.h5
 
+     Attribute "high/low" of the group /bar_none in the file quux.h5
+
+      h5dump -a "/bar_none/high\/low" quux.h5
+
   2) Selecting a subset from dataset /foo in file quux.h5
 
       h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl
index d3b12e3..050a3a3 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/tnofilename-with-packed-bits.ddl
@@ -10,6 +10,9 @@ usage: h5dump [OPTIONS] files
      -e, --escape         Escape non printing characters
      -V, --version        Print version number and exit
      -a P, --attribute=P  Print the specified attribute
+                          If an attribute name contains a slash (/), escape the
+                          slash with a preceding backslash (\).
+                          (See example section below.)
      -d P, --dataset=P    Print the specified dataset
      -y, --noindex        Do not print array indices with the data
      -p, --properties     Print dataset filters, storage layout and fill value
@@ -81,6 +84,10 @@ usage: h5dump [OPTIONS] files
 
       h5dump -a /bar_none/foo quux.h5
 
+     Attribute "high/low" of the group /bar_none in the file quux.h5
+
+      h5dump -a "/bar_none/high\/low" quux.h5
+
   2) Selecting a subset from dataset /foo in file quux.h5
 
       h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl
index 0da055b..5608d2b 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/tpbitsIncomplete.ddl
@@ -10,6 +10,9 @@ usage: h5dump [OPTIONS] files
      -e, --escape         Escape non printing characters
      -V, --version        Print version number and exit
      -a P, --attribute=P  Print the specified attribute
+                          If an attribute name contains a slash (/), escape the
+                          slash with a preceding backslash (\).
+                          (See example section below.)
      -d P, --dataset=P    Print the specified dataset
      -y, --noindex        Do not print array indices with the data
      -p, --properties     Print dataset filters, storage layout and fill value
@@ -81,6 +84,10 @@ usage: h5dump [OPTIONS] files
 
       h5dump -a /bar_none/foo quux.h5
 
+     Attribute "high/low" of the group /bar_none in the file quux.h5
+
+      h5dump -a "/bar_none/high\/low" quux.h5
+
   2) Selecting a subset from dataset /foo in file quux.h5
 
       h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl
index 594d70c..f89b65f 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/tpbitsLengthExceeded.ddl
@@ -10,6 +10,9 @@ usage: h5dump [OPTIONS] files
      -e, --escape         Escape non printing characters
      -V, --version        Print version number and exit
      -a P, --attribute=P  Print the specified attribute
+                          If an attribute name contains a slash (/), escape the
+                          slash with a preceding backslash (\).
+                          (See example section below.)
      -d P, --dataset=P    Print the specified dataset
      -y, --noindex        Do not print array indices with the data
      -p, --properties     Print dataset filters, storage layout and fill value
@@ -81,6 +84,10 @@ usage: h5dump [OPTIONS] files
 
       h5dump -a /bar_none/foo quux.h5
 
+     Attribute "high/low" of the group /bar_none in the file quux.h5
+
+      h5dump -a "/bar_none/high\/low" quux.h5
+
   2) Selecting a subset from dataset /foo in file quux.h5
 
       h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index 7b3b678..ba32aa6 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -10,6 +10,9 @@ usage: h5dump [OPTIONS] files
      -e, --escape         Escape non printing characters
      -V, --version        Print version number and exit
      -a P, --attribute=P  Print the specified attribute
+                          If an attribute name contains a slash (/), escape the
+                          slash with a preceding backslash (\).
+                          (See example section below.)
      -d P, --dataset=P    Print the specified dataset
      -y, --noindex        Do not print array indices with the data
      -p, --properties     Print dataset filters, storage layout and fill value
@@ -81,6 +84,10 @@ usage: h5dump [OPTIONS] files
 
       h5dump -a /bar_none/foo quux.h5
 
+     Attribute "high/low" of the group /bar_none in the file quux.h5
+
+      h5dump -a "/bar_none/high\/low" quux.h5
+
   2) Selecting a subset from dataset /foo in file quux.h5
 
       h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl
index 60bc2b1..16f953d 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/tpbitsMaxExceeded.ddl
@@ -10,6 +10,9 @@ usage: h5dump [OPTIONS] files
      -e, --escape         Escape non printing characters
      -V, --version        Print version number and exit
      -a P, --attribute=P  Print the specified attribute
+                          If an attribute name contains a slash (/), escape the
+                          slash with a preceding backslash (\).
+                          (See example section below.)
      -d P, --dataset=P    Print the specified dataset
      -y, --noindex        Do not print array indices with the data
      -p, --properties     Print dataset filters, storage layout and fill value
@@ -81,6 +84,10 @@ usage: h5dump [OPTIONS] files
 
       h5dump -a /bar_none/foo quux.h5
 
+     Attribute "high/low" of the group /bar_none in the file quux.h5
+
+      h5dump -a "/bar_none/high\/low" quux.h5
+
   2) Selecting a subset from dataset /foo in file quux.h5
 
       h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl
index 5db6a91..446fe2d 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/tpbitsOffsetExceeded.ddl
@@ -10,6 +10,9 @@ usage: h5dump [OPTIONS] files
      -e, --escape         Escape non printing characters
      -V, --version        Print version number and exit
      -a P, --attribute=P  Print the specified attribute
+                          If an attribute name contains a slash (/), escape the
+                          slash with a preceding backslash (\).
+                          (See example section below.)
      -d P, --dataset=P    Print the specified dataset
      -y, --noindex        Do not print array indices with the data
      -p, --properties     Print dataset filters, storage layout and fill value
@@ -81,6 +84,10 @@ usage: h5dump [OPTIONS] files
 
       h5dump -a /bar_none/foo quux.h5
 
+     Attribute "high/low" of the group /bar_none in the file quux.h5
+
+      h5dump -a "/bar_none/high\/low" quux.h5
+
   2) Selecting a subset from dataset /foo in file quux.h5
 
       h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl
index 060fc37..747cf99 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/tpbitsOffsetNegative.ddl
@@ -10,6 +10,9 @@ usage: h5dump [OPTIONS] files
      -e, --escape         Escape non printing characters
      -V, --version        Print version number and exit
      -a P, --attribute=P  Print the specified attribute
+                          If an attribute name contains a slash (/), escape the
+                          slash with a preceding backslash (\).
+                          (See example section below.)
      -d P, --dataset=P    Print the specified dataset
      -y, --noindex        Do not print array indices with the data
      -p, --properties     Print dataset filters, storage layout and fill value
@@ -81,6 +84,10 @@ usage: h5dump [OPTIONS] files
 
       h5dump -a /bar_none/foo quux.h5
 
+     Attribute "high/low" of the group /bar_none in the file quux.h5
+
+      h5dump -a "/bar_none/high\/low" quux.h5
+
   2) Selecting a subset from dataset /foo in file quux.h5
 
       h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5