Backout of bug 303669 which broke AppendComment and possibly a number

of other items.

27 files changed, 88 insertions, 88 deletions

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index d20af1268..c7e763748 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -339,7 +339,7 @@ sub actual_time {
     return $self->{'actual_time'};
 }
 
-sub any_flags_requesteeble {
+sub any_flags_requesteeble () {
     my ($self) = @_;
     return $self->{'any_flags_requesteeble'} 
         if exists $self->{'any_flags_requesteeble'};
@@ -351,7 +351,7 @@ sub any_flags_requesteeble {
     return $self->{'any_flags_requesteeble'};
 }
 
-sub attachments {
+sub attachments () {
     my ($self) = @_;
     return $self->{'attachments'} if exists $self->{'attachments'};
     return [] if $self->{'error'};
@@ -359,7 +359,7 @@ sub attachments {
     return $self->{'attachments'};
 }
 
-sub assigned_to {
+sub assigned_to () {
     my ($self) = @_;
     return $self->{'assigned_to'} if exists $self->{'assigned_to'};
     $self->{'assigned_to_id'} = 0 if $self->{'error'};
@@ -367,7 +367,7 @@ sub assigned_to {
     return $self->{'assigned_to'};
 }
 
-sub blocked {
+sub blocked () {
     my ($self) = @_;
     return $self->{'blocked'} if exists $self->{'blocked'};
     return [] if $self->{'error'};
@@ -378,7 +378,7 @@ sub blocked {
 # Even bugs in an error state always have a bug_id.
 sub bug_id { $_[0]->{'bug_id'}; }
 
-sub cc {
+sub cc () {
     my ($self) = @_;
     return $self->{'cc'} if exists $self->{'cc'};
     return [] if $self->{'error'};
@@ -396,7 +396,7 @@ sub cc {
     return $self->{'cc'};
 }
 
-sub dependson {
+sub dependson () {
     my ($self) = @_;
     return $self->{'dependson'} if exists $self->{'dependson'};
     return [] if $self->{'error'};
@@ -405,7 +405,7 @@ sub dependson {
     return $self->{'dependson'};
 }
 
-sub flag_types {
+sub flag_types () {
     my ($self) = @_;
     return $self->{'flag_types'} if exists $self->{'flag_types'};
     return [] if $self->{'error'};
@@ -430,7 +430,7 @@ sub flag_types {
     return $self->{'flag_types'};
 }
 
-sub keywords {
+sub keywords () {
     my ($self) = @_;
     return $self->{'keywords'} if exists $self->{'keywords'};
     return () if $self->{'error'};
@@ -456,7 +456,7 @@ sub longdescs {
     return $self->{'longdescs'};
 }
 
-sub milestoneurl {
+sub milestoneurl () {
     my ($self) = @_;
     return $self->{'milestoneurl'} if exists $self->{'milestoneurl'};
     return '' if $self->{'error'};
@@ -464,7 +464,7 @@ sub milestoneurl {
     return $self->{'milestoneurl'};
 }
 
-sub qa_contact {
+sub qa_contact () {
     my ($self) = @_;
     return $self->{'qa_contact'} if exists $self->{'qa_contact'};
     return undef if $self->{'error'};
@@ -480,7 +480,7 @@ sub qa_contact {
     return $self->{'qa_contact'};
 }
 
-sub reporter {
+sub reporter () {
     my ($self) = @_;
     return $self->{'reporter'} if exists $self->{'reporter'};
     $self->{'reporter_id'} = 0 if $self->{'error'};
@@ -489,7 +489,7 @@ sub reporter {
 }
 
 
-sub show_attachment_flags {
+sub show_attachment_flags () {
     my ($self) = @_;
     return $self->{'show_attachment_flags'} 
         if exists $self->{'show_attachment_flags'};
@@ -694,7 +694,7 @@ sub choices {
 # the alias.
 # Queries the database for the bug with a given alias, and returns
 # the ID of the bug if it exists or the undefined value if it doesn't.
-sub bug_alias_to_id {
+sub bug_alias_to_id ($) {
     my ($alias) = @_;
     return undef unless Param("usebugaliases");
     my $dbh = Bugzilla->dbh;
@@ -707,7 +707,7 @@ sub bug_alias_to_id {
 # Subroutines
 #####################################################################
 
-sub AppendComment {
+sub AppendComment ($$$;$$$) {
     my ($bugid, $whoid, $comment, $isprivate, $timestamp, $work_time) = @_;
     $work_time ||= 0;
     my $dbh = Bugzilla->dbh;
@@ -992,7 +992,7 @@ sub CountOpenDependencies {
     return @dependencies;
 }
 
-sub ValidateComment {
+sub ValidateComment ($) {
     my ($comment) = @_;
 
     if (defined($comment) && length($comment) > MAX_COMMENT_LENGTH) {
@@ -1242,7 +1242,7 @@ sub ValidateBugAlias {
 }
 
 # Validate and return a hash of dependencies
-sub ValidateDependencies {
+sub ValidateDependencies($$$) {
     my $fields = {};
     $fields->{'dependson'} = shift;
     $fields->{'blocked'} = shift;
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 35026b48e..6bbebfa7c 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -112,7 +112,7 @@ END
 # All the names are email addresses, not userids
 # values are scalars, except for cc, which is a list
 # This hash usually comes from the "mailrecipients" var in a template call.
-sub Send {
+sub Send($;$) {
     my ($id, $forced) = (@_);
 
     # This only works in a sub. Probably something to do with the
@@ -122,7 +122,7 @@ sub Send {
     return ProcessOneBug($id, $forced);
 }
 
-sub ProcessOneBug {
+sub ProcessOneBug($$) {
     my ($id, $forced) = (@_);
 
     my @headerlist;
@@ -474,7 +474,7 @@ sub ProcessOneBug {
     return {'sent' => \@sent, 'excluded' => \@excluded};
 }
 
-sub sendMail {
+sub sendMail($$$$$$$$$$$$) {
     my ($user, $hlRef, $relRef, $valueRef, $dmhRef, $fdRef,  
         $diffRef, $newcomments, $anyprivate, $start, 
         $id) = @_;
@@ -608,7 +608,7 @@ sub sendMail {
     return 1;
 }
 
-sub MessageToMTA {
+sub MessageToMTA ($) {
     my ($msg) = (@_);
     return if (Param('mail_delivery_method') eq "none");
 
@@ -639,7 +639,7 @@ sub MessageToMTA {
     $mailer->close;
 }
 
-sub encode_qp_words {
+sub encode_qp_words($) {
     my ($line) = (@_);
     my @encoded;
     foreach my $word (split / /, $line) {
@@ -652,7 +652,7 @@ sub encode_qp_words {
     return join(' ', @encoded);
 }
 
-sub encode_message {
+sub encode_message($$) {
     my ($header, $body) = @_;
 
     # read header into MIME::Entity
@@ -735,14 +735,14 @@ sub encode_message {
 # its value will be placed into the string. If it's not a key in the hash,
 # then the value of the parameter called "some_variable_name" will be placed
 # into the string.
-sub PerformSubsts {
+sub PerformSubsts ($;$) {
     my ($str, $substs) = (@_);
     $str =~ s/%([a-z]*)%/(defined $substs->{$1} ? $substs->{$1} : Param($1))/eg;
     return $str;
 }
 
 # Send the login name and password of the newly created account to the user.
-sub MailPassword {
+sub MailPassword ($$) {
     my ($login, $password) = (@_);
     my $template = Param("passwordmail");
     my $msg = PerformSubsts($template,
diff --git a/Bugzilla/Classification.pm b/Bugzilla/Classification.pm
index 4f50848a2..c35c0ba9b 100644
--- a/Bugzilla/Classification.pm
+++ b/Bugzilla/Classification.pm
@@ -105,7 +105,7 @@ sub description { return $_[0]->{'description'}; }
 ####      Subroutines      ####
 ###############################
 
-sub get_all_classifications {
+sub get_all_classifications () {
     my $dbh = Bugzilla->dbh;
 
     my $ids = $dbh->selectcol_arrayref(q{
@@ -118,7 +118,7 @@ sub get_all_classifications {
     return @classifications;
 }
 
-sub check_classification {
+sub check_classification ($) {
     my ($class_name) = @_;
 
     unless ($class_name) {
diff --git a/Bugzilla/Component.pm b/Bugzilla/Component.pm
index f1d4c24b2..216616d98 100644
--- a/Bugzilla/Component.pm
+++ b/Bugzilla/Component.pm
@@ -103,7 +103,7 @@ sub default_qa_contact { return $_[0]->{'initialqacontact'}; }
 ####      Subroutines      ####
 ###############################
 
-sub get_components_by_product {
+sub get_components_by_product ($) {
     my ($product_id) = @_;
     my $dbh = Bugzilla->dbh;
 
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 67cf4ae9c..43c14a551 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -128,12 +128,12 @@ sub FetchOneColumn {
     return $row[0];
 }
 
-sub PushGlobalSQLState {
+sub PushGlobalSQLState() {
     push @SQLStateStack, $_current_sth;
     push @SQLStateStack, $_fetchahead;
 }
 
-sub PopGlobalSQLState {
+sub PopGlobalSQLState() {
     die ("PopGlobalSQLState: stack underflow") if ( scalar(@SQLStateStack) < 1 );
     $_fetchahead = pop @SQLStateStack;
     $_current_sth = pop @SQLStateStack;
@@ -153,7 +153,7 @@ sub connect_shadow {
                     Param("shadowdbsock"), $db_user, $db_pass);
 }
 
-sub connect_main {
+sub connect_main (;$) {
     my ($no_db_name) = @_;
     my $connect_to_db = $db_name;
     $connect_to_db = "" if $no_db_name;
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 37771257c..ed82f805b 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -27,7 +27,7 @@ use Bugzilla::Util;
 use Bugzilla::Error;
 
 
-sub check_form_field {
+sub check_form_field ($$;$) {
     my ($cgi, $fieldname, $legalsRef) = @_;
     my $dbh = Bugzilla->dbh;
 
@@ -45,7 +45,7 @@ sub check_form_field {
     }
 }
 
-sub check_form_field_defined {
+sub check_form_field_defined ($$) {
     my ($cgi, $fieldname) = @_;
 
     if (!defined $cgi->param($fieldname)) {
diff --git a/Bugzilla/Group.pm b/Bugzilla/Group.pm
index e24ccb254..808860274 100644
--- a/Bugzilla/Group.pm
+++ b/Bugzilla/Group.pm
@@ -106,7 +106,7 @@ sub is_active    { return $_[0]->{'isactive'};     }
 #####  Module Subroutines    ###
 ################################
 
-sub ValidateGroupName {
+sub ValidateGroupName ($$) {
     my ($name, @users) = (@_);
     my $dbh = Bugzilla->dbh;
     my $query = "SELECT id FROM groups " .
@@ -125,7 +125,7 @@ sub ValidateGroupName {
     return $ret;
 }
 
-sub get_group_controls_by_product {
+sub get_group_controls_by_product ($) {
     my ($product_id) = @_;
     my $dbh = Bugzilla->dbh;
 
diff --git a/Bugzilla/Milestone.pm b/Bugzilla/Milestone.pm
index fa8fc0f82..6956d5313 100644
--- a/Bugzilla/Milestone.pm
+++ b/Bugzilla/Milestone.pm
@@ -99,7 +99,7 @@ sub sortkey    { return $_[0]->{'sortkey'};    }
 #####     Subroutines      #####
 ################################
 
-sub get_milestones_by_product {
+sub get_milestones_by_product ($) {
     my ($product_id) = @_;
     my $dbh = Bugzilla->dbh;
 
@@ -125,7 +125,7 @@ sub get_milestones_by_product {
     return @milestones;
 }
 
-sub check_milestone {
+sub check_milestone ($$) {
     my ($product, $milestone_name) = @_;
 
     unless ($milestone_name) {
@@ -142,7 +142,7 @@ sub check_milestone {
     return $milestone;
 }
 
-sub check_sort_key {
+sub check_sort_key ($$) {
     my ($milestone_name, $sortkey) = @_;
     # Keep a copy in case detaint_signed() clears the sortkey
     my $stored_sortkey = $sortkey;
diff --git a/Bugzilla/Product.pm b/Bugzilla/Product.pm
index 7af2995c2..26c80103f 100644
--- a/Bugzilla/Product.pm
+++ b/Bugzilla/Product.pm
@@ -178,7 +178,7 @@ sub classification_id { return $_[0]->{'classification_id'}; }
 ####      Subroutines    ######
 ###############################
 
-sub get_products_by_classification {
+sub get_products_by_classification ($) {
     my ($class_id) = @_;
     my $dbh = Bugzilla->dbh;
     $class_id ||= DEFAULT_CLASSIFICATION_ID;
@@ -205,7 +205,7 @@ sub get_products_by_classification {
     return @products;
 }
 
-sub get_all_products {
+sub get_all_products () {
     my $dbh = Bugzilla->dbh;
 
     my $ids = $dbh->selectcol_arrayref(q{
@@ -218,7 +218,7 @@ sub get_all_products {
     return @products;
 }
 
-sub check_product {
+sub check_product ($) {
     my ($product_name) = @_;
 
     unless ($product_name) {
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 711144a6f..5c5aff574 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -97,7 +97,7 @@ sub sortAcceptLanguage {
 # Returns the path to the templates based on the Accept-Language
 # settings of the user and of the available languages
 # If no Accept-Language is present it uses the defined default
-sub getTemplateIncludePath {
+sub getTemplateIncludePath () {
     # Return cached value if available
 
     # XXXX - mod_perl!
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 717aeaf37..fe72915a3 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -249,7 +249,7 @@ sub HasEmailChangeToken {
     return $token;
 }
 
-sub GetTokenData {
+sub GetTokenData($) {
     # Returns the userid, issuedate and eventdata for the specified token
 
     my ($token) = @_;
@@ -263,7 +263,7 @@ sub GetTokenData {
          WHERE  token = ?", undef, $token);
 }
 
-sub DeleteToken {
+sub DeleteToken($) {
     # Deletes specified token
 
     my ($token) = @_;
@@ -280,7 +280,7 @@ sub DeleteToken {
 # Internal Functions
 ################################################################################
 
-sub _create_token {
+sub _create_token($$$) {
     # Generates a unique token and inserts it into the database
     # Returns the token and the token timestamp
     my ($userid, $tokentype, $eventdata) = @_;
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 5462aa5d4..f9efcd248 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -1156,7 +1156,7 @@ sub get_userlist {
     return $self->{'userlist'};
 }
 
-sub insert_new_user {
+sub insert_new_user ($$;$$) {
     my ($username, $realname, $password, $disabledtext) = (@_);
     my $dbh = Bugzilla->dbh;
 
@@ -1201,7 +1201,7 @@ sub insert_new_user {
     return $password;
 }
 
-sub is_available_username {
+sub is_available_username ($;$) {
     my ($username, $old_username) = @_;
 
     if(login_to_id($username) != 0) {
@@ -1237,7 +1237,7 @@ sub is_available_username {
     return 1;
 }
 
-sub login_to_id {
+sub login_to_id ($) {
     my ($login) = (@_);
     my $dbh = Bugzilla->dbh;
     # $login will only be used by the following SELECT statement, so it's safe.
@@ -1252,7 +1252,7 @@ sub login_to_id {
     }
 }
 
-sub UserInGroup {
+sub UserInGroup ($) {
     return defined Bugzilla->user->groups->{$_[0]} ? 1 : 0;
 }
 
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index d70bc13dd..43100b160 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -138,7 +138,7 @@ sub url_decode {
     return $todecode;
 }
 
-sub i_am_cgi {
+sub i_am_cgi () {
     # I use SERVER_SOFTWARE because it's required to be
     # defined for all requests in the CGI spec.
     return exists $ENV{'SERVER_SOFTWARE'} ? 1 : 0;
@@ -221,7 +221,7 @@ sub diff_strings {
     return ($removed, $added);
 }
 
-sub wrap_comment {
+sub wrap_comment ($) {
     my ($comment) = @_;
     my $wrappedcomment = "";
 
@@ -245,7 +245,7 @@ sub wrap_comment {
     return $wrappedcomment;
 }
 
-sub find_wrap_point {
+sub find_wrap_point ($$) {
     my ($string, $maxpos) = @_;
     if (!$string) { return 0 }
     if (length($string) < $maxpos) { return length($string) }
@@ -264,7 +264,7 @@ sub find_wrap_point {
     return $wrappoint;
 }
 
-sub format_time {
+sub format_time ($;$) {
     my ($date, $format) = @_;
 
     # If $format is undefined, try to guess the correct date format.    
@@ -316,7 +316,7 @@ sub format_time_decimal {
     return $newtime;
 }
 
-sub file_mod_time {
+sub file_mod_time ($) {
     my ($filename) = (@_);
     my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
         $atime,$mtime,$ctime,$blksize,$blocks)
@@ -324,7 +324,7 @@ sub file_mod_time {
     return $mtime;
 }
 
-sub bz_crypt {
+sub bz_crypt ($) {
     my ($password) = @_;
 
     # The list of characters that can appear in a salt.  Salts and hashes
diff --git a/Bugzilla/Version.pm b/Bugzilla/Version.pm
index 473a186c2..3a460e028 100644
--- a/Bugzilla/Version.pm
+++ b/Bugzilla/Version.pm
@@ -97,7 +97,7 @@ sub product_id { return $_[0]->{'product_id'}; }
 #####     Subroutines       ###
 ###############################
 
-sub get_versions_by_product {
+sub get_versions_by_product ($) {
     my ($product_id) = @_;
     my $dbh = Bugzilla->dbh;
 
@@ -123,7 +123,7 @@ sub get_versions_by_product {
     return @versions;
 }
 
-sub check_version {
+sub check_version ($$) {
     my ($product, $version_name) = @_;
 
     $version_name || ThrowUserError('version_not_specified');
diff --git a/buglist.cgi b/buglist.cgi
index c307c8960..45c0db552 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -226,7 +226,7 @@ sub LookupNamedQuery {
 #
 # Returns: A boolean true value if the query existed in the database 
 # before, and we updated it. A boolean false value otherwise.
-sub InsertNamedQuery {
+sub InsertNamedQuery ($$$;$) {
     my ($userid, $query_name, $query, $link_in_footer) = @_;
     $link_in_footer ||= 0;
     $query_name = trim($query_name);
diff --git a/checksetup.pl b/checksetup.pl
index 3a7f42559..f8385449e 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -518,14 +518,14 @@ EOT
     die "Syntax error in localconfig";
 }
 
-sub LocalVarExists
+sub LocalVarExists ($)
 {
     my ($name) = @_;
     return $main::{$name}; # if localconfig declared it, we're done.
 }
 
 my $newstuff = "";
-sub LocalVar
+sub LocalVar ($$)
 {
     my ($name, $definition) = @_;
     return if LocalVarExists($name); # if localconfig declared it, we're done.
@@ -1615,7 +1615,7 @@ $dbh->bz_setup_database();
 # Populate groups table
 ###########################################################################
 
-sub GroupDoesExist
+sub GroupDoesExist ($)
 {
     my ($name) = @_;
     my $sth = $dbh->prepare("SELECT name FROM groups WHERE name='$name'");
@@ -1656,7 +1656,7 @@ sub AddGroup {
 
 my $headernum = 1;
 
-sub AddFDef {
+sub AddFDef ($$$) {
     my ($name, $description, $mailhead) = (@_);
 
     my $sth = $dbh->prepare("SELECT fieldid FROM fielddefs " .
@@ -1750,7 +1750,7 @@ AddFDef("content", "Content", 0);
 # mkanat@bugzilla.org - bug 17453
 # Create the values for the tables that hold what used to be enum types.
 # Don't populate the tables if the table isn't empty.
-sub PopulateEnumTable {
+sub PopulateEnumTable ($@) {
     my ($table, @valuelist) = @_;
 
     # If we encounter any of the keys in this hash, they are 
diff --git a/docs/makedocs.pl b/docs/makedocs.pl
index 5a001ea06..2fb0911b2 100644
--- a/docs/makedocs.pl
+++ b/docs/makedocs.pl
@@ -52,7 +52,7 @@ else {
 # Subs
 ###############################################################################
 
-sub MakeDocs {
+sub MakeDocs($$) {
 
     my ($name, $cmdline) = @_;
 
diff --git a/editclassifications.cgi b/editclassifications.cgi
index e70d256c1..5e49d8336 100755
--- a/editclassifications.cgi
+++ b/editclassifications.cgi
@@ -38,7 +38,7 @@ my $dbh = Bugzilla->dbh;
 my $template = Bugzilla->template;
 my $vars = {};
 
-sub LoadTemplate {
+sub LoadTemplate ($) {
     my $action = shift;
 
     $action =~ /(\w+)/;
diff --git a/editcomponents.cgi b/editcomponents.cgi
index 1f86b03a8..6f8bc99f2 100755
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -49,7 +49,7 @@ my $showbugcounts = (defined $cgi->param('showbugcounts'));
 # TestComponent:  just returns if the specified product/component combination exists
 # CheckComponent: same check, optionally emit an error text
 
-sub TestProduct
+sub TestProduct ($)
 {
     my $prod = shift;
 
@@ -60,7 +60,7 @@ sub TestProduct
     return FetchOneColumn();
 }
 
-sub CheckProduct
+sub CheckProduct ($)
 {
     my $prod = shift;
 
@@ -75,7 +75,7 @@ sub CheckProduct
     }
 }
 
-sub TestComponent
+sub TestComponent ($$)
 {
     my ($prod, $comp) = @_;
 
@@ -89,7 +89,7 @@ sub TestComponent
     return FetchOneColumn();
 }
 
-sub CheckComponent
+sub CheckComponent ($$)
 {
     my ($prod, $comp) = @_;
 
diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index 9984a8e8c..57795f493 100755
--- a/editflagtypes.cgi
+++ b/editflagtypes.cgi
@@ -567,7 +567,7 @@ sub validateGroups {
 # added by the user and have passed all validation tests.
 # The only way to have invalid product/component combinations is to
 # hack the URL. So we silently ignore them, if any.
-sub validateAndSubmit {
+sub validateAndSubmit ($) {
     my ($id) = @_;
     my $dbh = Bugzilla->dbh;
 
diff --git a/editgroups.cgi b/editgroups.cgi
index eb245dfd2..5e74163da 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -51,7 +51,7 @@ UserInGroup("creategroups")
 my $action = trim($cgi->param('action') || '');
 
 # RederiveRegexp: update user_group_map with regexp-based grants
-sub RederiveRegexp
+sub RederiveRegexp ($$)
 {
     my $regexp = shift;
     my $gid = shift;
diff --git a/editkeywords.cgi b/editkeywords.cgi
index 450d8cf5b..8ad74710e 100755
--- a/editkeywords.cgi
+++ b/editkeywords.cgi
@@ -35,7 +35,7 @@ my $dbh = Bugzilla->dbh;
 use vars qw($template $vars);
 
 
-sub Validate {
+sub Validate ($$) {
     my ($name, $description) = @_;
     if ($name eq "") {
         ThrowUserError("keyword_blank_name");
diff --git a/editproducts.cgi b/editproducts.cgi
index de0459f13..18e845efc 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -54,7 +54,7 @@ my %ctl = (
 # TestProduct:  just returns if the specified product does exists
 # CheckProduct: same check, optionally  emit an error text
 
-sub TestProduct
+sub TestProduct ($)
 {
     my $prod = shift;
 
@@ -65,7 +65,7 @@ sub TestProduct
     return FetchOneColumn();
 }
 
-sub CheckProduct
+sub CheckProduct ($)
 {
     my $prod = shift;
 
@@ -86,7 +86,7 @@ sub CheckProduct
 # TestClassification:  just returns if the specified classification does exists
 # CheckClassification: same check, optionally  emit an error text
 
-sub TestClassification
+sub TestClassification ($)
 {
     my $cl = shift;
 
@@ -97,7 +97,7 @@ sub TestClassification
     return FetchOneColumn();
 }
 
-sub CheckClassification
+sub CheckClassification ($)
 {
     my $cl = shift;
 
@@ -119,7 +119,7 @@ sub CheckClassification
 # we need this routine, which does things properly, and will
 # eventually be the only version. (The older versions assume a
 # $template->put_header() call has been made)
-sub CheckClassificationNew
+sub CheckClassificationNew ($)
 {
     my $cl = shift;
 
@@ -135,7 +135,7 @@ sub CheckClassificationNew
 }
 
 
-sub CheckClassificationProduct
+sub CheckClassificationProduct ($$)
 {
     my $cl = shift;
     my $prod = shift;
@@ -162,7 +162,7 @@ sub CheckClassificationProduct
     }
 }
 
-sub CheckClassificationProductNew
+sub CheckClassificationProductNew ($$)
 {
     my ($cl, $prod) = @_;
     my $dbh = Bugzilla->dbh;
@@ -190,7 +190,7 @@ sub CheckClassificationProductNew
 # Displays the form to edit a products parameters
 #
 
-sub EmitFormElements
+sub EmitFormElements ($$$$$$$$$)
 {
     my ($classification, $product, $description, $milestoneurl, $disallownew,
         $votesperuser, $maxvotesperbug, $votestoconfirm, $defaultmilestone)
@@ -251,7 +251,7 @@ sub EmitFormElements
 # Displays a text like "a.", "a or b.", "a, b or c.", "a, b, c or d."
 #
 
-sub PutTrailer
+sub PutTrailer (@)
 {
     my (@links) = ("Back to the <A HREF=\"query.cgi\">query page</A>", @_);
 
diff --git a/editvalues.cgi b/editvalues.cgi
index 897498db3..cd73daeab 100755
--- a/editvalues.cgi
+++ b/editvalues.cgi
@@ -39,14 +39,14 @@ our @valid_fields = ('op_sys', 'rep_platform', 'priority', 'bug_severity',);
 ######################################################################
 
 # Returns whether or not the specified table exists in the @tables array.
-sub FieldExists {
+sub FieldExists ($) {
   my ($field) = @_;
 
   return lsearch(\@valid_fields, $field) >= 0;
 }
 
 # Same as FieldExists, but emits and error and dies if it fails.
-sub FieldMustExist {
+sub FieldMustExist ($) {
     my ($field)= @_;
 
     $field ||
@@ -58,7 +58,7 @@ sub FieldMustExist {
 }
 
 # Returns if the specified value exists for the field specified.
-sub ValueExists {
+sub ValueExists ($$) {
     my ($field, $value) = @_;
     FieldMustExist($field);
     trick_taint($field);
@@ -75,7 +75,7 @@ sub ValueExists {
 }
 
 # Same check as ValueExists, emits an error text and dies if it fails.
-sub ValueMustExist {
+sub ValueMustExist ($$) {
     my ($field, $value)= @_;
 
     # Values may not be empty (it's very difficult to deal 
diff --git a/process_bug.cgi b/process_bug.cgi
index e4daf38d5..9a3db0a8f 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -210,7 +210,7 @@ check_form_field_defined($cgi, 'component');
 # function and tests, if the comment was given.
 # If comments are required for functions is defined by params.
 #
-sub CheckonComment {
+sub CheckonComment( $ ) {
     my ($function) = (@_);
     
     # Param is 1 if comment should be added !
diff --git a/sanitycheck.cgi b/sanitycheck.cgi
index 7855862d8..00a7ef0c5 100755
--- a/sanitycheck.cgi
+++ b/sanitycheck.cgi
@@ -727,7 +727,7 @@ if (defined $cgi->param('rebuildkeywordcache')) {
 # General bug checks
 ###########################################################################
 
-sub BugCheck {
+sub BugCheck ($$;$$) {
     my ($middlesql, $errortext, $repairparam, $repairtext) = @_;
     
     SendSQL("SELECT DISTINCT bugs.bug_id " .
diff --git a/userprefs.cgi b/userprefs.cgi
index ae04e7a72..42ef255d3 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -337,7 +337,7 @@ sub DoPermissions {
 # No SavePermissions() because this panel has no changeable fields.
 
 
-sub DoSavedSearches {
+sub DoSavedSearches() {
     # 2004-12-13 - colin.ogilvie@gmail.com, bug 274397
     # Need to work around the possibly missing query_format=advanced
     $vars->{'user'} = Bugzilla->user;
@@ -362,7 +362,7 @@ sub DoSavedSearches {
     $vars->{'queries'} = \@newqueries;
 }
 
-sub SaveSavedSearches {
+sub SaveSavedSearches() {
     my $cgi = Bugzilla->cgi;
     my $dbh = Bugzilla->dbh;
     my @queries = @{Bugzilla->user->queries};