merge changes from dla source

[debbugs.git] / scripts / errorlib.in

diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index e0e70e7dda2d1ea6b9a62fff7736b5b3f0b0ee28..a93c79bf3542e376203c79f1664de98dbe839130 100755 (executable)
--- a/scripts/errorlib.in
+++ b/scripts/errorlib.in
@@ -1,14 +1,11 @@
 # -*- perl -*-
-# $Id: errorlib.in,v 1.52 2005/10/06 03:46:13 ajt Exp $
 
 use Mail::Address;
 use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
 use Debbugs::Packages qw(:all);
 use Debbugs::Common qw(:all);
 use Debbugs::Status qw(:all);
-
-sub F_SETLK { 6; } sub F_WRLCK{ 1; }
-$flockstruct= 'sslll'; # And there ought to be something for this too.
+use Carp;
 
 sub unlockreadbugmerge {
     local ($rv) = @_;
@@ -31,7 +28,7 @@ sub lockreadbugmerge {
 
 sub sani {
     my ($in) = @_;
-    warn "You should be using HTML::Entities instead.";
+    carp "You should be using HTML::Entities instead.";
     $in =~ s/([<>&"])/$saniarray{$1}/g;
     return $in;
 }
@@ -71,13 +68,6 @@ sub escapelog {
        return \@log;
 }
 
-sub isstrongseverity {
-    my $severity = shift;
-    $severity = $gDefaultSeverity if $severity eq '';
-    return grep { $_ eq $severity } @gStrongSeverities;
-}
-
-
 @severities= grep { not exists $gObsoleteSeverities{$_} } @gSeverityList;
 @showseverities= @severities;
 grep ($_= $_ eq '' ? $gDefaultSeverity : $_, @showseverities);