Corrected rule Global_Data_Size

9 files changed, 34 insertions, 25 deletions

diff --git a/INSTALL b/INSTALL
index 799a241..9ccc0fd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,8 +9,8 @@ All rights reserved.
 RELEASE INFORMATION
 
 Project:           ABI Compliance Checker (ACC)
-Version:           1.99.8.4
-Date:              2013-09-27
+Version:           1.99.8.5
+Date:              2013-10-03
 
 
 This file explains how to install and setup environment
diff --git a/abi-compliance-checker.pl b/abi-compliance-checker.pl
index cd279c7..6716938 100755
--- a/abi-compliance-checker.pl
+++ b/abi-compliance-checker.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ###########################################################################
-# ABI Compliance Checker (ACC) 1.99.8.4
+# ABI Compliance Checker (ACC) 1.99.8.5
 # A tool for checking backward compatibility of a C/C++ library API
 #
 # Copyright (C) 2009-2010 The Linux Foundation
@@ -64,7 +64,7 @@ use Storable qw(dclone);
 use Data::Dumper;
 use Config;
 
-my $TOOL_VERSION = "1.99.8.4";
+my $TOOL_VERSION = "1.99.8.5";
 my $ABI_DUMP_VERSION = "3.2";
 my $OLDEST_SUPPORTED_VERSION = "1.18";
 my $XML_REPORT_VERSION = "1.1";
@@ -13993,13 +13993,15 @@ sub mergeSymbols($)
                 {
                     if(get_PLevel($ReturnType1_Id, 1)==0)
                     {
-                        foreach my $SubProblemType (keys(%{$Sub_SubProblems}))
+                        if(defined $Sub_SubProblems->{"DataType_Size"})
                         { # add "Global_Data_Size" problem
-                            my $New_Value = $Sub_SubProblems->{$SubProblemType}{"New_Value"};
-                            my $Old_Value = $Sub_SubProblems->{$SubProblemType}{"Old_Value"};
-                            if($SubProblemType eq "DataType_Size")
-                            { # add a new problem
-                                $AddProblems->{"Global_Data_Size"} = $Sub_SubProblems->{$SubProblemType};
+                            foreach my $Loc (keys(%{$Sub_SubProblems->{"DataType_Size"}}))
+                            {
+                                if(index($Loc,"->")==-1)
+                                { # add a new problem
+                                    $AddProblems->{"Global_Data_Size"} = $Sub_SubProblems->{"DataType_Size"};
+                                    last;
+                                }
                             }
                         }
                     }
@@ -14025,7 +14027,10 @@ sub mergeSymbols($)
             {
                 foreach my $SubLocation (keys(%{$AddProblems->{$SubProblemType}}))
                 {
-                    my $NewLocation = ($SubLocation)?"retval->".$SubLocation:"retval";
+                    my $NewLocation = "retval";
+                    if($SubLocation and $SubLocation ne "retval") {
+                        $NewLocation = "retval->".$SubLocation;
+                    }
                     $CompatProblems{$Level}{$Symbol}{$SubProblemType}{$NewLocation} = $AddProblems->{$SubProblemType}{$SubLocation};
                 }
             }
@@ -14034,7 +14039,10 @@ sub mergeSymbols($)
             {
                 foreach my $SubLocation (keys(%{$Sub_SubProblems->{$SubProblemType}}))
                 {
-                    my $NewLocation = ($SubLocation)?"retval->".$SubLocation:"retval";
+                    my $NewLocation = "retval";
+                    if($SubLocation and $SubLocation ne "retval") {
+                        $NewLocation = "retval->".$SubLocation;
+                    }
                     $CompatProblems{$Level}{$Symbol}{$SubProblemType}{$NewLocation} = $Sub_SubProblems->{$SubProblemType}{$SubLocation};
                 }
             }
diff --git a/doc/Changes.html b/doc/Changes.html
index bc75dd8..f4e955a 100644
--- a/doc/Changes.html
+++ b/doc/Changes.html
@@ -21,7 +21,7 @@
 </style>
 <script src="/load.php?debug=false&amp;lang=en&amp;modules=startup&amp;only=scripts&amp;skin=monobook&amp;*"></script>
 <script>if(window.mw){
-	mw.config.set({"wgCanonicalNamespace": "", "wgCanonicalSpecialPageName": false, "wgNamespaceNumber": 0, "wgPageName": "ABI_compliance_checker_Downloads", "wgTitle": "ABI Compliance Checker Downloads", "wgCurRevisionId": 8326, "wgArticleId": 2293, "wgIsArticle": true, "wgAction": "view", "wgUserName": null, "wgUserGroups": ["*"], "wgCategories": ["ABI Compliance Checker"], "wgBreakFrames": false, "wgRestrictionEdit": [], "wgRestrictionMove": []});
+	mw.config.set({"wgCanonicalNamespace": "", "wgCanonicalSpecialPageName": false, "wgNamespaceNumber": 0, "wgPageName": "ABI_compliance_checker_Downloads", "wgTitle": "ABI Compliance Checker Downloads", "wgCurRevisionId": 8329, "wgArticleId": 2293, "wgIsArticle": true, "wgAction": "view", "wgUserName": null, "wgUserGroups": ["*"], "wgCategories": ["ABI Compliance Checker"], "wgBreakFrames": false, "wgRestrictionEdit": [], "wgRestrictionMove": []});
 }
 </script><script>if(window.mw){
 	mw.loader.load(["mediawiki.page.startup"]);
@@ -43,7 +43,7 @@
 </p>
 <table id="toc" class="toc"><tr><td><div id="toctitle"><h2>Contents</h2></div>
 <ul>
-<li class="toclevel-1 tocsection-1"><a href="#Version_1.99.8.4_.28September_27.2C_2013.29"><span class="tocnumber">1</span> <span class="toctext">Version 1.99.8.4 (September 27, 2013)</span></a></li>
+<li class="toclevel-1 tocsection-1"><a href="#Version_1.99.8.5_.28October_03.2C_2013.29"><span class="tocnumber">1</span> <span class="toctext">Version 1.99.8.5 (October 03, 2013)</span></a></li>
 <li class="toclevel-1 tocsection-2"><a href="#Version_1.99.7_.28July_01.2C_2013.29"><span class="tocnumber">2</span> <span class="toctext">Version 1.99.7 (July 01, 2013)</span></a></li>
 <li class="toclevel-1 tocsection-3"><a href="#Version_1.99.1_.28June_07.2C_2013.29"><span class="tocnumber">3</span> <span class="toctext">Version 1.99.1 (June 07, 2013)</span></a></li>
 <li class="toclevel-1 tocsection-4"><a href="#Version_1.99_.28May_24.2C_2013.29"><span class="tocnumber">4</span> <span class="toctext">Version 1.99 (May 24, 2013)</span></a></li>
@@ -92,8 +92,8 @@
 <li class="toclevel-1 tocsection-47"><a href="#Version_1.0_.28July_31.2C_2009.29"><span class="tocnumber">47</span> <span class="toctext">Version 1.0 (July 31, 2009)</span></a></li>
 </ul>
 </td></tr></table>
-<h2> <span class="mw-headline" id="Version_1.99.8.4_.28September_27.2C_2013.29"> Version 1.99.8.4 (September 27, 2013) </span></h2>
-<p><a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/archive/1.99.8.4.tar.gz">abi-compliance-checker-1.99.8.4.tar.gz</a><br />
+<h2> <span class="mw-headline" id="Version_1.99.8.5_.28October_03.2C_2013.29"> Version 1.99.8.5 (October 03, 2013) </span></h2>
+<p><a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/archive/1.99.8.5.tar.gz">abi-compliance-checker-1.99.8.5.tar.gz</a><br />
 </p><p><b>ACC 2.0</b> pre-release.
 </p><p>This is a bug-fix release with a few new features.
 </p>
@@ -116,6 +116,7 @@
 </li><li> Do not hang on class A&lt;N&gt;:public A&lt;N-1&gt;
 </li><li> Corrected identification of header files in the include_preamble
 </li><li> Corrected comparison of function pointer types
+</li><li> Corrected rule Global_Data_Size
 </li></ul>
 </li></ul>
 <ul><li> <b>Other</b>
@@ -1068,5 +1069,5 @@ Template argument size: 0/2097152 bytes
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2293-0!*!0!!en!*!* and timestamp 20130927112837 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2293-0!*!0!!en!*!* and timestamp 20131003141302 -->
 </div></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/doc/Descriptor.html b/doc/Descriptor.html
index e99b7e2..6386647 100644
--- a/doc/Descriptor.html
+++ b/doc/Descriptor.html
@@ -510,5 +510,5 @@ Template argument size: 0/2097152 bytes
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2415-0!*!*!!en!*!* and timestamp 20130927113009 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2415-0!*!*!!en!*!* and timestamp 20131003090256 -->
 </div></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/doc/Options.html b/doc/Options.html
index b8c71bc..0a0f054 100644
--- a/doc/Options.html
+++ b/doc/Options.html
@@ -286,5 +286,5 @@ Template argument size: 0/2097152 bytes
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2442-0!*!0!!en!*!* and timestamp 20130927112916 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2442-0!*!0!!en!*!* and timestamp 20131002225219 -->
 </div></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/doc/Readme.html b/doc/Readme.html
index 1a3ba98..0ada495 100644
--- a/doc/Readme.html
+++ b/doc/Readme.html
@@ -21,7 +21,7 @@
 </style>
 <script src="/load.php?debug=false&amp;lang=en&amp;modules=startup&amp;only=scripts&amp;skin=monobook&amp;*"></script>
 <script>if(window.mw){
-	mw.config.set({"wgCanonicalNamespace": "", "wgCanonicalSpecialPageName": false, "wgNamespaceNumber": 0, "wgPageName": "ABI_compliance_checker", "wgTitle": "ABI Compliance Checker", "wgCurRevisionId": 8328, "wgArticleId": 2292, "wgIsArticle": true, "wgAction": "view", "wgUserName": null, "wgUserGroups": ["*"], "wgCategories": ["ABI Compliance Checker"], "wgBreakFrames": false, "wgRestrictionEdit": [], "wgRestrictionMove": []});
+	mw.config.set({"wgCanonicalNamespace": "", "wgCanonicalSpecialPageName": false, "wgNamespaceNumber": 0, "wgPageName": "ABI_compliance_checker", "wgTitle": "ABI Compliance Checker", "wgCurRevisionId": 8330, "wgArticleId": 2292, "wgIsArticle": true, "wgAction": "view", "wgUserName": null, "wgUserGroups": ["*"], "wgCategories": ["ABI Compliance Checker"], "wgBreakFrames": false, "wgRestrictionEdit": [], "wgRestrictionMove": []});
 }
 </script><script>if(window.mw){
 	mw.loader.load(["mediawiki.page.startup"]);
@@ -93,7 +93,7 @@
 <h2> <span class="mw-headline" id="Downloads"> Downloads </span></h2>
 <h3> <span class="mw-headline" id="Releases"> Releases </span></h3>
 <p>All releases can be downloaded from <b><a href="Changes.html" title="ABI Compliance Checker Downloads">this page</a></b> or <b><a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/">github.com</a></b>.
-</p><p>Latest release: <a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/archive/1.99.8.4.tar.gz">1.99.8.4</a>
+</p><p>Latest release: <a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/archive/1.99.8.5.tar.gz">1.99.8.5</a>
 </p>
 <h3> <span class="mw-headline" id="Git"> Git </span></h3>
 <p>Read-only access to the latest development version:<br />
@@ -499,5 +499,5 @@ Template argument size: 0/2097152 bytes
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2292-0!*!0!!en!*!* and timestamp 20130927112946 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2292-0!*!0!!en!*!* and timestamp 20131003141322 -->
 </div></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/doc/SysCheck/Descriptor.html b/doc/SysCheck/Descriptor.html
index dbf9b21..f4b0b85 100644
--- a/doc/SysCheck/Descriptor.html
+++ b/doc/SysCheck/Descriptor.html
@@ -233,5 +233,5 @@ Template argument size: 0/2097152 bytes
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2657-0!*!*!!*!*!* and timestamp 20130926122940 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2657-0!*!*!!*!*!* and timestamp 20131002210431 -->
 </div></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/doc/SysCheck/Examples.html b/doc/SysCheck/Examples.html
index 62e2a44..3145a43 100644
--- a/doc/SysCheck/Examples.html
+++ b/doc/SysCheck/Examples.html
@@ -239,5 +239,5 @@ Template argument size: 0/2097152 bytes
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2656-0!*!*!!en!*!* and timestamp 20130927113014 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2656-0!*!*!!en!*!* and timestamp 20131003141353 -->
 </div></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/doc/SysCheck/Usage.html b/doc/SysCheck/Usage.html
index b187d6c..544f3dd 100644
--- a/doc/SysCheck/Usage.html
+++ b/doc/SysCheck/Usage.html
@@ -116,5 +116,5 @@ Template argument size: 0/2097152 bytes
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2655-0!*!0!!en!*!* and timestamp 20130927063354 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2655-0!*!0!!en!*!* and timestamp 20131003003719 -->
 </div></div></div></div></div></body></html>
\ No newline at end of file