pullup from trunk

ticket: 2796
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16980 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 4de8fce3856c6dbed0ab20d919f2849c5ac0f54c..5e792c8acdf819ffa9da868e5292c501464dd76f 100644 (file)
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-21  Tom Yu  <tlyu@mit.edu>
+
+       * def-check.pl: Check for PRIVATE or INTERNAL annotations in defs
+       file.
+
 2004-10-31  Tom Yu  <tlyu@mit.edu>
 
        * mkrel: Rework quoting for RELTAIL check.  Don't check RELTAIL if

diff --git a/src/util/def-check.pl b/src/util/def-check.pl
index 9b7aee15ee54be5f9cc05e98ec3df5bba2c8af5c..447421e8e792ea0b50bc046ad29aee081d087215 100644 (file)
--- a/src/util/def-check.pl
+++ b/src/util/def-check.pl
@@ -219,7 +219,9 @@ while (! $d->eof()) {
     }
     s/[ \t]*//g;
     my($xconv);
-    if (/!CALLCONV/ || /KRB5_CALLCONV_WRONG/) {
+    if (/PRIVATE/ || /INTERNAL/) {
+       $xconv = "PRIVATE";
+    } elsif (/!CALLCONV/ || /KRB5_CALLCONV_WRONG/) {
        $xconv = "KRB5_CALLCONV_WRONG";
     } elsif ($vararg{$_}) {
        $xconv = "KRB5_CALLCONV_C";
@@ -227,6 +229,11 @@ while (! $d->eof()) {
        $xconv = "KRB5_CALLCONV";
     }
     s/;.*$//;
+
+    if ($xconv eq "PRIVATE") {
+       print "\t private $_\n";
+       next LINE2;
+    }
     if (!defined($conv{$_})) {
        print "No calling convention specified for $_!\n";
     } elsif (! ($conv{$_} eq $xconv)) {