[svn-r9729] 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, 93 insertions, 78 deletions

diff --git a/bin/trace b/bin/trace
index a8b261e..c29d616 100755
--- a/bin/trace
+++ b/bin/trace
@@ -1,4 +1,17 @@
 #!/usr/bin/perl -w
+##
+## Copyright by the Board of Trustees of the University of Illinois.
+## All rights reserved.
+##
+## This file is part of HDF5.  The full HDF5 copyright notice, including
+## terms governing use, modification, and redistribution, is contained in
+## the files COPYING and Copyright.html.  COPYING can be found at the root
+## of the source code distribution tree; Copyright.html can be found at the
+## root level of an installed copy of the electronic HDF5 document set and
+## is linked from the top-level documents page.  It can also be found at
+## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+##
 require 5.003;
 $Source = "";
 
@@ -14,83 +27,85 @@ $Source = "";
 # Two-character strings begin with an upper-case letter which is
 # usually the same as the package name.
 #
-%TypeString = ("haddr_t"		   => "a",
-	       "hbool_t"                   => "b",
-               "double"                    => "d",
-               "H5D_alloc_time_t"          => "Da",
-               "H5D_fill_time_t"           => "Df",
-               "H5D_fill_value_t"          => "DF",
-               "H5D_layout_t"              => "Dl",
-               "H5FD_mpio_xfer_t"          => "Dt",
-               "herr_t"                    => "e",
-               "H5E_direction_t"           => "Ed",
-               "H5E_error_t*"              => "Ee",
-	       "H5E_major_t"               => "Ej",
-	       "H5E_minor_t"		   => "En",
-	       "H5F_close_degree_t"        => "Fd",
-	       "H5F_scope_t"               => "Fs",
-	       "H5FD_t*"		   => "x",
-	       "H5FD_class_t*"		   => "x",
-	       "H5FD_stream_fapl_t*"	   => "x",
-               "H5G_link_t"                => "Gl",
-               "H5G_stat_t*"               => "Gs",
-               "hsize_t"                   => "h",
-               "hssize_t"                  => "Hs",
-               "hid_t"                     => "i",
-               "int"                       => "Is",
-               "unsigned"                  => "Iu",
-               "unsigned int"              => "Iu",
-               "H5I_type_t"                => "It",
-               "MPI_Comm"                  => "Mc",
-               "MPI_Info"                  => "Mi",
-	       "H5FD_mem_t"		   => "Mt",
-               "off_t"                     => "o",
-               "H5P_class_t"               => "p",
-               "href_t"                    => "r",
-               "H5R_type_t"                => "Rt",
-               "char*"                     => "s",
-	       "H5S_class_t"               => "Sc",
-	       "H5S_seloper_t"             => "Ss",
-	       "H5S_sel_type"              => "St",
-               "htri_t"                    => "t",
-               "H5T_cset_t",               => "Tc",
-               "H5T_direction_t",          => "Td",
-               "H5T_norm_t"                => "Tn",
-               "H5T_order_t"               => "To",
-               "H5T_pad_t"                 => "Tp",
-	       "H5T_pers_t"		   => "Te",
-               "H5T_sign_t"                => "Ts",
-               "H5T_class_t"               => "Tt",
-               "H5T_str_t"                 => "Tz",
-               "void*"                     => "x",
-               "void**"                    => "x",
-               "FILE*"                     => "x",
-               "H5A_operator_t"            => "x",
-	       "H5D_operator_t"		   => "x",
-	       "H5E_auto_t"                => "x",
-               "H5E_walk_t"                => "x",
-               "H5G_iterate_t"             => "x",
-	       "H5MM_allocate_t"           => "x",
-	       "H5MM_free_t"               => "x",
-	       "H5P_cls_create_func_t"     => "x",
-	       "H5P_cls_copy_func_t"       => "x",
-	       "H5P_cls_close_func_t"      => "x",
-               "H5P_iterate_t"             => "x",
-	       "H5P_prp_create_func_t"     => "x",
-	       "H5P_prp_copy_func_t"       => "x",
-	       "H5P_prp_close_func_t"      => "x",
-	       "H5P_prp_delete_func_t"     => "x",
-	       "H5P_prp_get_func_t"        => "x",
-	       "H5P_prp_set_func_t"        => "x",
-	       "H5T_cdata_t**"             => "x",
-               "H5T_conv_t"                => "x",
-	       "H5T_overflow_t"            => "x",
-               "H5Z_func_t"                => "x",
-               "H5Z_filter_func_t"         => "x",
-               "size_t"                    => "z",
-               "H5Z_EDC_t"                 => "Ze",
-               "H5Z_filter_t"              => "Zf",
-               "ssize_t"                   => "Zs",
+%TypeString = ("haddr_t"                    => "a",
+               "hbool_t"                    => "b",
+               "double"                     => "d",
+               "H5D_alloc_time_t"           => "Da",
+               "H5D_fill_time_t"            => "Df",
+               "H5D_fill_value_t"           => "DF",
+               "H5D_layout_t"               => "Dl",
+               "H5D_space_status_t"         => "Ds",
+               "H5FD_mpio_xfer_t"           => "Dt",
+               "herr_t"                     => "e",
+               "H5E_direction_t"            => "Ed",
+               "H5E_error_t*"               => "Ee",
+	       "H5E_major_t"                => "Ej",
+	       "H5E_minor_t"		    => "En",
+               "H5F_close_degree_t"         => "Fd",
+               "H5F_scope_t"                => "Fs",
+               "H5FD_t*"                    => "x",
+               "H5FD_class_t*"              => "x",
+               "H5FD_stream_fapl_t*"        => "x",
+               "H5G_link_t"                 => "Gl",
+               "H5G_obj_t"                  => "Go",
+               "H5G_stat_t*"                => "Gs",
+               "hsize_t"                    => "h",
+               "hssize_t"                   => "Hs",
+               "hid_t"                      => "i",
+               "int"                        => "Is",
+               "unsigned"                   => "Iu",
+               "unsigned int"               => "Iu",
+               "H5I_type_t"                 => "It",
+               "MPI_Comm"                   => "Mc",
+               "MPI_Info"                   => "Mi",
+               "H5FD_mem_t"                 => "Mt",
+               "off_t"                      => "o",
+               "H5P_class_t"                => "p",
+               "H5R_type_t"                 => "Rt",
+               "char*"                      => "s",
+               "H5S_class_t"                => "Sc",
+               "H5S_seloper_t"              => "Ss",
+               "H5S_sel_type"               => "St",
+               "htri_t"                     => "t",
+               "H5T_cset_t",                => "Tc",
+               "H5T_direction_t",           => "Td",
+               "H5T_norm_t"                 => "Tn",
+               "H5T_order_t"                => "To",
+               "H5T_pad_t"                  => "Tp",
+               "H5T_pers_t"                 => "Te",
+               "H5T_sign_t"                 => "Ts",
+               "H5T_class_t"                => "Tt",
+               "H5T_str_t"                  => "Tz",
+               "void*"                      => "x",
+               "void**"                     => "x",
+               "FILE*"                      => "x",
+               "H5A_operator_t"             => "x",
+               "H5D_operator_t"             => "x",
+               "H5E_auto_t"                 => "x",
+               "H5E_walk_t"                 => "x",
+               "H5G_iterate_t"              => "x",
+               "H5MM_allocate_t"            => "x",
+               "H5MM_free_t"                => "x",
+               "H5P_cls_create_func_t"      => "x",
+               "H5P_cls_copy_func_t"        => "x",
+               "H5P_cls_close_func_t"       => "x",
+               "H5P_iterate_t"              => "x",
+               "H5P_prp_create_func_t"      => "x",
+               "H5P_prp_copy_func_t"        => "x",
+               "H5P_prp_close_func_t"       => "x",
+               "H5P_prp_delete_func_t"      => "x",
+               "H5P_prp_get_func_t"         => "x",
+               "H5P_prp_set_func_t"         => "x",
+               "H5T_cdata_t**"              => "x",
+               "H5T_conv_t"                 => "x",
+	       "H5T_overflow_t"             => "x",
+               "H5Z_func_t"                 => "x",
+               "H5Z_filter_func_t"          => "x",
+               "size_t"                     => "z",
+               "H5Z_class_t*"               => "Zc",
+               "H5Z_EDC_t"                  => "Ze",
+               "H5Z_filter_t"               => "Zf",
+               "ssize_t"                    => "Zs",
               );
 
 ##############################################################################
@@ -227,7 +242,7 @@ sub rewrite_func ($$$$$) {
     }
   } elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) {
     # Replaced an H5TRACE macro
-  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*\(.*?\);)\n/"$1$2$trace"/es) {
+  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*\(.*?\);??)\n/"$1$2$trace"/es) {
     # Added an H5TRACE macro after a FUNC_ENTER macro.
   } else {
     errmesg $file, $name, "unable to insert tracing information";