remove perl warnings from scripts.

2 files changed, 13 insertions, 7 deletions

diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index e79d3afd72..afd0802968 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -1,6 +1,4 @@
-eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
-  & eval 'exec perl -wS "$0" $argv:q'
-    if 0;
+#!/usr/bin/perl
 
 ## Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
 ##                    added -texinfo, -listfunc, -pkg-name
@@ -184,7 +182,7 @@ $blankline_man = "";
 		     $type_struct, "\$1",
 		     $type_param, "\$1" );
 $blankline_text = "";
-
+my $lineprefix = "";
 
 sub usage {
     print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man | -tex | -texinfo  -listfunc ]\n";
@@ -746,7 +744,7 @@ sub dump_function {
 #	    print STDERR " :> @args\n";
 	    $type = join " ", @args;
 
-	    if ($parameters{$param} eq "" && $param != "void") {
+	    if ((!defined($parameters{$param}) || $parameters{$param} eq "") && $param ne "void") {
 		$parameters{$param} = "-- undescribed --";
 		print STDERR "warning: $lineno: Function parameter '$param' not described in '$function_name'\n";
 	    }
diff --git a/doc/scripts/sort2.pl b/doc/scripts/sort2.pl
index 171bab7f9a..485c20f708 100755
--- a/doc/scripts/sort2.pl
+++ b/doc/scripts/sort2.pl
@@ -7,11 +7,19 @@ sub key_of_record {
 
   # Split record into lines:
   my @lines = split /\n/, $record;
+  my $max = @lines;
+  if ($max > 5) {
+    $max = 5;
+  }
+  
+  if ($max < 2) {
+    return "";
+  }
 
   my ($i) = 1;
   my ($key) = $lines[$i];
 
-  while( !($key =~ /^\@deftypefun/) && ($i < 5)) { $i=$i+1; $key = $lines[$i]; }
+  while( !($key =~ /^\@deftypefun/) && ($i < $max)) { $i=$i+1; $key = $lines[$i]; }
 
   $key = $1 if $key =~ /^\@deftypefun {.*} {(.*)}/;
 
@@ -20,7 +28,7 @@ sub key_of_record {
   return $key;
 }
 
-$/="@end deftypefun";          # Records are separated by blank lines.
+$/="\@end deftypefun";          # Records are separated by blank lines.
 @records = <>;  # Read in whole file, one record per array element.
 
 @records = sort { key_of_record($a) cmp key_of_record($b) } @records;