[svn-r9727] Purpose:

    Bug Fix/Code Cleanup/Doc Cleanup/Optimization/Branch Sync :-)

Description:
    Generally speaking, this is the "signed->unsigned" change to selections.
However, in the process of merging code back, things got stickier and stickier
until I ended up doing a big "sync the two branches up" operation.  So... I
brought back all the "infrastructure" fixes from the development branch to the
release branch (which I think were actually making some improvement in
performance) as well as fixed several bugs which had been fixed in one branch,
but not the other.

    I've also tagged the repository before making this checkin with the label
"before_signed_unsigned_changes".

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel & fphdf5
    FreeBSD 4.10 (sleipnir) w/threadsafe
    FreeBSD 4.10 (sleipnir) w/backward compatibility
    Solaris 2.7 (arabica) w/"purify options"
    Solaris 2.8 (sol) w/FORTRAN & C++
    AIX 5.x (copper) w/parallel & FORTRAN
    IRIX64 6.5 (modi4) w/FORTRAN
    Linux 2.4 (heping) w/FORTRAN & C++


Misc. update:

1 files changed, 8 insertions, 8 deletions

diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index ab88f4d..75f4a64 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -79,7 +79,7 @@ usage (const char *prog)
  *-------------------------------------------------------------------------
  */
 
-void
+static void
 parse_command_line (int argc, const char *argv[])
 {
   int opt = FALSE;
@@ -122,7 +122,7 @@ parse_command_line (int argc, const char *argv[])
  *
  *-------------------------------------------------------------------------
  */
-void
+int
 main (int argc, const char *argv[])
 {
   char *ifname;
@@ -144,7 +144,7 @@ main (int argc, const char *argv[])
     {
       error_msg (progname, "missing file name\n");
       usage (progname);
-      exit (EXIT_FAILURE);
+      return (EXIT_FAILURE);
     }
 
   ifname = strdup (argv[opt_ind]);
@@ -154,7 +154,7 @@ main (int argc, const char *argv[])
   if (testval <= 0)
     {
       error_msg (progname, "Input HDF5 file is not HDF \"%s\"\n", ifname);
-      exit (EXIT_FAILURE);
+      return (EXIT_FAILURE);
     }
 
   ifile = H5Fopen (ifname, H5F_ACC_RDONLY, H5P_DEFAULT);
@@ -162,7 +162,7 @@ main (int argc, const char *argv[])
   if (ifile < 0)
     {
       error_msg (progname, "Can't open input HDF5 file \"%s\"\n", ifname);
-      exit (EXIT_FAILURE);
+      return (EXIT_FAILURE);
     }
 
   plist = H5Fget_create_plist (ifile);
@@ -170,14 +170,14 @@ main (int argc, const char *argv[])
     {
       error_msg (progname, "Can't get file creation plist for file \"%s\"\n",
 		 ifname);
-      exit (EXIT_FAILURE);
+      return (EXIT_FAILURE);
     }
 
   status = H5Pget_userblock (plist, &usize);
   if (status < 0)
     {
       error_msg (progname, "Can't get user block for file \"%s\"\n", ifname);
-      exit (EXIT_FAILURE);
+      return (EXIT_FAILURE);
     }
 
   printf ("%ld\n", (long) usize);
@@ -185,5 +185,5 @@ main (int argc, const char *argv[])
   H5Pclose (plist);
   H5Fclose (ifile);
 
-  exit (EXIT_SUCCESS);
+  return (EXIT_SUCCESS);
 }