Normalization of 1.12 branch with develop (#1598)

9 files changed, 24 insertions, 19 deletions

diff --git a/bin/buildhdf5 b/bin/buildhdf5
index 113a278..786c35d 100755
--- a/bin/buildhdf5
+++ b/bin/buildhdf5
@@ -178,7 +178,7 @@ LOCATE_SZLIB()
 	    esac
 	    ;;	# end of case ncsa
 	unknown)
-	    # Unknow domain. Give a shot at the some standard places.
+	    # Unknown domain. Give a shot at the some standard places.
 	    szlibpaths="/usr/local"
 	    ;;
     esac	# end of case $mydomain
diff --git a/bin/checkposix b/bin/checkposix
index 36d07a8..bca259d 100755
--- a/bin/checkposix
+++ b/bin/checkposix
@@ -115,7 +115,7 @@ foreach $arg (@ARGV) {
 
             # These are really HDF5 functions/macros even though they don't
             # start with `h' or `H'.
-            next if $name =~ /^FUNC_(ENTER|LEAVE)(_(NO)?API|_PACKAGE|_STATIC)?(_NOFS|_NOCLEAR|_NOINIT|_NOPUSH)?(_NOFUNC|_TAG)?$/;
+            next if $name =~ /^FUNC_(ENTER|LEAVE)(_(NO)?API|_PACKAGE|_STATIC)?(_NAMECHECK_ONLY|_NOFS|_NOCLEAR|_NOINIT|_NOPUSH)?(_NOFUNC|_TAG)?$/;
             next if $name =~ /^(BEGIN|END)_FUNC$/;
             next if $name =~ /^U?INT(8|16|32|64)(ENCODE|DECODE)(_VAR)?$/;
             next if $name =~ /^CI_(PRINT_STATS|INC_SRC|INC_DST)$/;
@@ -123,10 +123,13 @@ foreach $arg (@ARGV) {
             next if $name =~ /^(MIN3?|MAX3?|NELMTS|POWER_OF_TWO|REGION_OVERFLOW)$/;
             next if $name =~ /^(SIZE_OVERFLOW|UNIQUE_MEMBERS|S_ISDIR)$/;
             next if $name =~ /^addr_defined$/;
+            next if $name =~ /^TERMINATOR$/;
 
-            # These functions/macros are exempt.
-            # op, cb, and OP are often spuriously flagged so ignore them.
-            next if $name =~ /^(main|op|cb|OP)$/;
+            # Ignore callback invocation
+            next if $name =~ /^(op|cb|OP|iter_op|func)$/;
+
+            # Ignore main
+            next if $name =~ /^main$/;
 
             # This often appears in preprocessor lines that span multiple lines
             next if $name =~ /^(defined)$/;
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5
index da1aef8..e59c772 100755
--- a/bin/cmakehdf5
+++ b/bin/cmakehdf5
@@ -199,7 +199,7 @@ DUMP_LOGFILE()
 # Show a start time stamp
 TIMESTAMP
 
-# Initialize njobs if $AMKE is defined
+# Initialize njobs if $MAKE is defined
 if [ -n "$MAKE" ]; then
     # assume all arguments are for --jobs
     njobs=`echo $MAKE | cut -s -d' ' -f2-`
@@ -365,7 +365,7 @@ STEP "Test the library and tools..." "ctest . -C Release $njobs" $testlog
 #      7. Create an install image with this command:
 STEP "Create an install image..." "cpack -C Release CPackConfig.cmake" $packlog
 
-# The implementation of installation is imcomplete (only works for linux).
+# The implementation of installation is incomplete (only works for linux).
 # Screen it out for now till it is completed.
 if false; then
 #      8. Install with this command:
diff --git a/bin/genparser b/bin/genparser
index 462c2c2..9ea3152 100755
--- a/bin/genparser
+++ b/bin/genparser
@@ -27,7 +27,7 @@
 # IMPORTANT OS X NOTE
 #
 # If you are using OS X, you will probably not have flex or bison
-# installed. In addtion, even if you do have bison installed, the bison
+# installed. In addition, even if you do have bison installed, the bison
 # version you have installed may also have a bug that makes it unable to
 # process our input files.
 #
diff --git a/bin/h5cc.in b/bin/h5cc.in
index 6024b4d..966bb40 100644
--- a/bin/h5cc.in
+++ b/bin/h5cc.in
@@ -40,7 +40,7 @@ HL="@HL@"
 ##    $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS   ##
 ##    $LIBS $clibpath $link_objs $link_args $shared_link                  ##
 ##                                                                        ##
-## These settings can be overriden by setting HDF5_CFLAGS,                ##
+## These settings can be overridden by setting HDF5_CFLAGS,               ##
 ## HDF5_CPPFLAGS, HDF5_LDFLAGS, or HDF5_LIBS in the environment.          ##
 ##                                                                        ##
 ############################################################################
@@ -144,7 +144,7 @@ usage() {
   echo "                                           shared libraries]"
   echo " "
   echo " You can also add or change paths and flags to the compile line using"
-  echo " the following environment varibles or by assigning them to their counterparts"
+  echo " the following environment variables or by assigning them to their counterparts"
   echo " in the 'Things You Can Modify to Override...'" section of $prog_name
   echo " "
   echo "  Variable              Current value to be replaced"
@@ -318,7 +318,7 @@ fi
 
 if test "x$do_link" = "xyes"; then
   shared_link=""
-# conditionnaly link with the hl library
+# conditionally link with the hl library
   if test "X$HL" = "Xhl"; then
    libraries=" $libraries -lhdf5_hl -lhdf5 "
   else
diff --git a/bin/make_vers b/bin/make_vers
index 7e99d88..f1399a4 100755
--- a/bin/make_vers
+++ b/bin/make_vers
@@ -6,10 +6,10 @@ use warnings;
 # (The max_idx parameter is the only thing that needs to be changed when adding
 #       support for a new major release.  If support for a prior major release
 #       is added (like support for 1.4, etc), the min_sup_idx parameter will
-#       need to be decremented. - QAK)
+#       need to be decremented.)
 
-# Max. library "index" (0 = v1.0, 1 = 1.2, 2 = 1.4, 3 = 1.6, 4 = 1.8, 5 = 1.10, 6 = 1.12, etc)
-$max_idx = 6;
+# Max. library "index" (0 = v1.0, 1 = 1.2, 2 = 1.4, 3 = 1.6, 4 = 1.8, 5 = 1.10, 6 = 1.12, 7 = 1.14, etc)
+$max_idx = 7;
 
 # Min. supported previous library version "index" (0 = v1.0, 1 = 1.2, etc)
 $min_sup_idx = 3;
diff --git a/bin/newer b/bin/newer
index e60ec45..5f0fdca 100755
--- a/bin/newer
+++ b/bin/newer
@@ -19,7 +19,7 @@
 # Created Date: 2005/07/06
 # Modification:
 #    Albert Cheng 2005/8/30
-#    Changed from two arguments to mulitple arguments.
+#    Changed from two arguments to multiple arguments.
 
 if test $# -lt 2; then
     exit 1
diff --git a/bin/trace b/bin/trace
index 2b519e4..1159f63 100755
--- a/bin/trace
+++ b/bin/trace
@@ -248,7 +248,9 @@ sub argstring ($$$) {
 
   # Normalize the data type by removing redundant white space,
   # certain type qualifiers, and indirection.
-  $atype =~ s/^\bconst\b//;
+  $atype =~ s/^\bconst\b//;     # Leading const
+  $atype =~ s/\s*const\s*//;    # const after type, possibly in the middle of '*'s
+  $atype =~ s/^\bstatic\b//;
   $atype =~ s/\bH5_ATTR_UNUSED\b//g;
   $atype =~ s/\bH5_ATTR_DEPRECATED_USED\b//g;
   $atype =~ s/\bH5_ATTR_NDEBUG_UNUSED\b//g;
@@ -276,7 +278,7 @@ sub argstring ($$$) {
   } else {
     $tstr = $TypeString{$atype};
   }
-  return ("*" x $ptr) . ($array?"[$array]":"") . $tstr;
+  return ("*" x $ptr) . ($array ? "[$array]" : "") . $tstr;
 }
 
 ##############################################################################
@@ -305,7 +307,7 @@ sub rewrite_func ($$$$$) {
     my %names;
 
     for $arg (@args) {
-      if($arg=~/\w*\.{3}\w*/){
+      if($arg=~/\w*\.{3}\w*/){  # Skip "..." for varargs parameter
         next;
       }
       unless ($arg=~/^(([a-z_A-Z]\w*\s+)+\**)
diff --git a/bin/warnhist b/bin/warnhist
index 742a6b5..0150138 100755
--- a/bin/warnhist
+++ b/bin/warnhist
@@ -78,7 +78,7 @@ sub do_help {
     print "\t-S <file string list>\tDisplay warnings for files which contain a string, <file string list>\n";
     print "\t\t<file string list> is a comma separated list, with no spaces\n";
     print "\t\tFor example: 'H5Fint' or 'H5Fint,H5Gnode'\n";
-    print "\t-l\tDisplay line nunbers for file/warning\n";
+    print "\t-l\tDisplay line numbers for file/warning\n";
     print "\t-u\tLeave 'unique' types in warnings, instead of genericizing them\n";
     print "\t-i <name list>\tIgnore named files, <name list>\n";
     print "\t\t<name list> is a comma separated list, with no spaces\n";