[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)

2 files changed, 34 insertions, 34 deletions

diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 13059f2..c5c447c 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -65,29 +65,29 @@
 
 int main(int argc, const char *argv[])
 {
- int        ret;
- const char *fname1 = NULL;
- const char *fname2 = NULL;
- const char *objname1  = NULL;
- const char *objname2  = NULL;
- hsize_t    nfound=0;
- diff_opt_t options;
+    int        ret;
+    const char *fname1 = NULL;
+    const char *fname2 = NULL;
+    const char *objname1  = NULL;
+    const char *objname2  = NULL;
+    hsize_t    nfound=0;
+    diff_opt_t options;
 
- parse_input(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
+    parse_input(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
 
- nfound = h5diff(fname1,fname2,objname1,objname2,&options);
+    nfound = h5diff(fname1,fname2,objname1,objname2,&options);
 
- print_info(&options);
+    print_info(&options);
 
-/*-------------------------------------------------------------------------
- * exit code
- *   >0 if differences, 0 if no differences, <0 if error
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * exit code
+    *   >0 if differences, 0 if no differences, <0 if error
+    *-------------------------------------------------------------------------
+    */
 
- ret= (nfound==0 ? 0 : 1 );
- if (options.err_stat)
-  ret=-1;
- return ret;
+    ret = (nfound == 0 ? 0 : 1 );
+    if(options.err_stat)
+        ret = -1;
+    return ret;
 }
 
diff --git a/tools/h5diff/ph5diff_main.c b/tools/h5diff/ph5diff_main.c
index 989a74b..9cbc993 100644
--- a/tools/h5diff/ph5diff_main.c
+++ b/tools/h5diff/ph5diff_main.c
@@ -72,40 +72,40 @@ int main(int argc, const char *argv[])
 
     if(g_nTasks == 1)
     {
-    printf("Only 1 task available...doing serial diff\n");
+        printf("Only 1 task available...doing serial diff\n");
 
-    g_Parallel = 0;
+        g_Parallel = 0;
 
-    parse_input(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
+        parse_input(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
 
-    nfound = h5diff(fname1,fname2,objname1,objname2,&options);
+        nfound = h5diff(fname1, fname2, objname1, objname2, &options);
 
-    print_info(&options);
+        print_info(&options);
 
-    MPI_Finalize();
+        MPI_Finalize();
 
-    return 0;
+        return 0;
     }
 
     /* Have the manager process the command-line */
     if(nID == 0)
     {
-    parse_input(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
+        parse_input(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
 
-    nfound = h5diff(fname1,fname2,objname1,objname2,&options);
+        nfound = h5diff(fname1, fname2, objname1, objname2, &options);
 
-    MPI_Barrier(MPI_COMM_WORLD);
+        MPI_Barrier(MPI_COMM_WORLD);
 
-    print_info(&options);
-    print_manager_output();
+        print_info(&options);
+        print_manager_output();
 
-    MPI_Finalize();
+        MPI_Finalize();
 
-    return 0;
+        return 0;
     }
     /* All other tasks become workers and wait for assignments. */
     else
-    ph5diff_worker(nID);
+        ph5diff_worker(nID);
 }
 
 /*-------------------------------------------------------------------------