[svn-r14144] Description:

	Move H5Gget_objinfo() to deprecated symbols section and retarget
internal usage to H5Lget_info()/H5Oget_info().

	Misc. other code cleanups...

Tested on:
	FreeBSD/32 6.2 (duty)
	FreeBSD/64 6.2 (liberty)
	Linux/32 2.6 (kagiso)
	Linux/64 2.6 (smirom)
	AIX/32 5.3 (copper)
	Solaris/32 2.10 (linew)
	Mac OS X/32 10.4.10 (amazon)

1 files changed, 71 insertions, 71 deletions

diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml
index 1cbbf2e..c6de351 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/testfiles/tcompound.h5.xml
@@ -24,57 +24,6 @@ Expected output for 'h5dump --xml tcompound.h5'
          </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
-   <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424" H5Path="/type1" Parents="xid_696" H5ParentPaths="/">
-      <hdf5:DataType>
-         <hdf5:CompoundType>
-            <hdf5:Field FieldName="int_name">
-               <hdf5:DataType>
-                  <hdf5:AtomicType>
-                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </hdf5:AtomicType>
-               </hdf5:DataType>
-            </hdf5:Field>
-            <hdf5:Field FieldName="float_name">
-               <hdf5:DataType>
-                  <hdf5:AtomicType>
-                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </hdf5:AtomicType>
-               </hdf5:DataType>
-            </hdf5:Field>
-         </hdf5:CompoundType>
-      </hdf5:DataType>
-   </hdf5:NamedDataType>
-   <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792" H5Path="/type2" Parents="xid_696" H5ParentPaths="/">
-      <hdf5:DataType>
-         <hdf5:CompoundType>
-            <hdf5:Field FieldName="int_array">
-               <hdf5:DataType>
-                  <hdf5:ArrayType Ndims="1">
-                     <hdf5:ArrayDimension DimSize="4"/>
-                     <hdf5:DataType>
-                        <hdf5:AtomicType>
-                           <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                        </hdf5:AtomicType>
-                     </hdf5:DataType>
-                  </hdf5:ArrayType>
-               </hdf5:DataType>
-            </hdf5:Field>
-            <hdf5:Field FieldName="float_array">
-               <hdf5:DataType>
-                  <hdf5:ArrayType Ndims="2">
-                     <hdf5:ArrayDimension DimSize="5"/>
-                     <hdf5:ArrayDimension DimSize="6"/>
-                     <hdf5:DataType>
-                        <hdf5:AtomicType>
-                           <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                        </hdf5:AtomicType>
-                     </hdf5:DataType>
-                  </hdf5:ArrayType>
-               </hdf5:DataType>
-            </hdf5:Field>
-         </hdf5:CompoundType>
-      </hdf5:DataType>
-   </hdf5:NamedDataType>
    <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
@@ -122,26 +71,6 @@ Expected output for 'h5dump --xml tcompound.h5'
       </hdf5:Data>
    </hdf5:Dataset>
    <hdf5:Group Name="group1" OBJ-XID="xid_2104" H5Path="/group1" Parents="xid_696" H5ParentPaths="/" >
-      <hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592" H5Path="/group1/type3" Parents="xid_2104" H5ParentPaths="/group1">
-         <hdf5:DataType>
-            <hdf5:CompoundType>
-               <hdf5:Field FieldName="int">
-                  <hdf5:DataType>
-                     <hdf5:AtomicType>
-                        <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                     </hdf5:AtomicType>
-                  </hdf5:DataType>
-               </hdf5:Field>
-               <hdf5:Field FieldName="float">
-                  <hdf5:DataType>
-                     <hdf5:AtomicType>
-                        <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                     </hdf5:AtomicType>
-                  </hdf5:DataType>
-               </hdf5:Field>
-            </hdf5:CompoundType>
-         </hdf5:DataType>
-      </hdf5:NamedDataType>
       <hdf5:Dataset Name="dset2" OBJ-XID="xid_2152" H5Path= "/group1/dset2" Parents="xid_2104" H5ParentPaths="/group1">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
@@ -298,6 +227,26 @@ Expected output for 'h5dump --xml tcompound.h5'
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>
+      <hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592" H5Path="/group1/type3" Parents="xid_2104" H5ParentPaths="/group1">
+         <hdf5:DataType>
+            <hdf5:CompoundType>
+               <hdf5:Field FieldName="int">
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:Field>
+               <hdf5:Field FieldName="float">
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:Field>
+            </hdf5:CompoundType>
+         </hdf5:DataType>
+      </hdf5:NamedDataType>
    </hdf5:Group>
    <hdf5:Group Name="group2" OBJ-XID="xid_6584" H5Path="/group2" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Dataset Name="dset5" OBJ-XID="xid_7040" H5Path= "/group2/dset5" Parents="xid_6584" H5ParentPaths="/group2">
@@ -323,5 +272,56 @@ Expected output for 'h5dump --xml tcompound.h5'
          </hdf5:Data>
       </hdf5:Dataset>
    </hdf5:Group>
+   <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424" H5Path="/type1" Parents="xid_696" H5ParentPaths="/">
+      <hdf5:DataType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="float_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
+      </hdf5:DataType>
+   </hdf5:NamedDataType>
+   <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792" H5Path="/type2" Parents="xid_696" H5ParentPaths="/">
+      <hdf5:DataType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int_array">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="1">
+                     <hdf5:ArrayDimension DimSize="4"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="float_array">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="2">
+                     <hdf5:ArrayDimension DimSize="5"/>
+                     <hdf5:ArrayDimension DimSize="6"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
+      </hdf5:DataType>
+   </hdf5:NamedDataType>
 </hdf5:RootGroup>
 </hdf5:HDF5-File>