[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, 146 insertions, 147 deletions

diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index e22502f..60e96b2 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -25,18 +25,18 @@
  */
 
 typedef struct {
- int    m_quiet;   /* quiet mide: no output at all */
- int    m_report;  /* report mode: print the data */
- int    m_verbose; /* verbose mode: print the data, list of objcets, warnings */
- int    d;         /* delta, absolute value to compare */
- double delta;     /* delta value */
- int    p;         /* relative error to compare*/
- double percent;   /* relative error value */
- int    n;         /* count, compare up to count */
- hsize_t count;    /* count value */
- int    err_stat;  /* an error ocurred (1, error, 0, no error) */
- int    cmn_objs;  /* do we have comparable objects */
- int    not_cmp;   /* are the objects comparable */
+    int    m_quiet;   /* quiet mide: no output at all */
+    int    m_report;  /* report mode: print the data */
+    int    m_verbose; /* verbose mode: print the data, list of objcets, warnings */
+    int    d;         /* delta, absolute value to compare */
+    double delta;     /* delta value */
+    int    p;         /* relative error to compare*/
+    double percent;   /* relative error value */
+    int    n;         /* count, compare up to count */
+    hsize_t count;    /* count value */
+    int    err_stat;  /* an error ocurred (1, error, 0, no error) */
+    int    cmn_objs;  /* do we have comparable objects */
+    int    not_cmp;   /* are the objects comparable */
 } diff_opt_t;
 
 
@@ -89,7 +89,7 @@ hsize_t diff( hid_t      file1_id,
               hid_t      file2_id,
               const char *path2,
               diff_opt_t *options,
-              H5G_obj_t  type );
+              h5trav_type_t  type );
 
 hsize_t diff_compare( hid_t file1_id,
                       const char *file1_name,
@@ -177,161 +177,160 @@ hsize_t diff_datum(void       *_mem1,
 
 
 hsize_t diff_float(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_double(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_schar(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_uchar(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_short(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_ushort(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_int(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_uint(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_long(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_ulong(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_llong(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 hsize_t diff_ullong(unsigned char *mem1,
- unsigned char *mem2,
- hsize_t       nelmts,
- hsize_t       hyper_start,
- int           rank,
- hsize_t       *dims,
- hsize_t       *acc,
- hsize_t       *pos,
- diff_opt_t    *options,
- const char    *obj1,
- const char    *obj2,
- int           *ph);
-
-
+                   unsigned char *mem2,
+                   hsize_t       nelmts,
+                   hsize_t       hyper_start,
+                   int           rank,
+                   hsize_t       *dims,
+                   hsize_t       *acc,
+                   hsize_t       *pos,
+                   diff_opt_t    *options,
+                   const char    *obj1,
+                   const char    *obj2,
+                   int           *ph);
 
 #endif  /* H5DIFF_H__ */
+