merge and fix conflicts

2 files changed, 28 insertions, 5 deletions

diff --git a/bin/trace b/bin/trace
index 34bcd3a..50fd2f3 100755
--- a/bin/trace
+++ b/bin/trace
@@ -100,24 +100,35 @@ $Source = "";
                "H5T_str_t"                  => "Tz",
                "unsigned long"              => "Ul",
                "unsigned long long"         => "UL",
+               "H5VL_subclass_t"            => "VS",
+               "H5VL_get_conn_lvl_t"        => "VL",
                "H5VL_attr_get_t"            => "Va",
+               "H5VL_attr_optional_t"       => "Vs",
                "H5VL_attr_specific_t"       => "Vb",
                "H5VL_blob_specific_t"       => "VB",
                "H5VL_class_value_t"         => "VC",
                "H5VL_dataset_get_t"         => "Vc",
                "H5VL_dataset_specific_t"    => "Vd",
+               "H5VL_dataset_optional_t"    => "Vt",
                "H5VL_datatype_get_t"        => "Ve",
                "H5VL_datatype_specific_t"   => "Vf",
+               "H5VL_datatype_optional_t"   => "Vu",
                "H5VL_file_get_t"            => "Vg",
                "H5VL_file_specific_t"       => "Vh",
+               "H5VL_file_optional_t"       => "Vv",
                "H5VL_group_get_t"           => "Vi",
                "H5VL_group_specific_t"      => "Vj",
+               "H5VL_group_optional_t"      => "Vw",
                "H5VL_link_create_type_t"    => "Vk",
                "H5VL_link_get_t"            => "Vl",
                "H5VL_link_specific_t"       => "Vm",
+               "H5VL_link_optional_t"       => "Vx",
                "H5VL_object_get_t"          => "Vn",
                "H5VL_object_specific_t"     => "Vo",
+               "H5VL_object_optional_t"     => "Vy",
                "H5VL_request_specific_t"    => "Vr",
+               "H5VL_request_optional_t"    => "Vz",
+               "H5VL_blob_optional_t"       => "VA",
                "void"                       => "x",
                "FILE"                       => "x",
                "H5A_operator_t"             => "x",
diff --git a/bin/warnhist b/bin/warnhist
index 7e56246..a88474b 100755
--- a/bin/warnhist
+++ b/bin/warnhist
@@ -1,5 +1,6 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 require 5.003;
+use warnings;
 
 #
 # Copyright by The HDF Group.
@@ -205,8 +206,13 @@ while (<>) {
         ($last_c_name, $toss) = split /\:/, $_;
     }
 
+    # Retain C/C++ compile line, which comes with the line of warning
+    if($_ =~ /.*[A-Za-z0-9_]\.[chC]\(.*[0-9]\):.*#.*/) {
+        $last_c_name = $_;
+    }
+
     # Skip lines that don't have the word "warning"
-    next if $_ !~ /[Ww]arning:/;
+    next if $_ !~ /[Ww]arning/;
 
     # Skip warnings from linker
     next if $_ =~ /ld: warning:/;
@@ -256,11 +262,16 @@ while (<>) {
     } elsif($_ =~ /^\".*, line [0-9]+: *[Ww]arning:.*/) {
         ($name, $toss, $warning, $extra, $extra2) = split /\:/, $_;
         ($name, $line) = split /\,/, $name;
-	$name =~ s/^\"//g;
-	$name =~ s/\"$//g;
-	$line =~ s/^\s*line\s*//g;
+	    $name =~ s/^\"//g;
+	    $name =~ s/\"$//g;
+	    $line =~ s/^\s*line\s*//g;
 # print "name:'", $name, "'-'", $line, "'\n";
 # print "warning:'", $warning, "'\n";
+    # Check for Intel icc warning
+    } elsif($_ =~ /.*[A-Za-z0-9_]\.[chC]\(.*[0-9]\):.*#.*/) {
+        ($last_c_name, $toss, $warning) = split /\:/, $last_c_name;
+        ($name, $line) = split /\(/, $last_c_name;
+        $line =~ s/\)//g;
     } else {
         # Check for 'character offset' field appended to file & line #
 	# (This is probably specific to GCC)
@@ -330,6 +341,7 @@ while (<>) {
     # Convert all quotes to '
     $warning =~ s/‘/'/g;
     $warning =~ s/’/'/g;
+    $warning =~ s/"/'/g;
 
 #
 # These skipped messages & "genericizations" may be specific to GCC