fixes to quiet -w since

damien_carbery@hyperion.com is having trouble with them.

webtools/tinderbox2/src/lib/BonsaiData.pm

@@ -7,8 +7,8 @@
 # module which uses this library is: lib/TinderDB/VC_Bonsai.pm
 
 
-# $Revision: 1.11 $ 
-# $Date: 2002/05/03 04:40:08 $ 
+# $Revision: 1.12 $ 
+# $Date: 2002/05/08 17:42:59 $ 
 # $Author: kestes%walrus.com $ 
 # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/lib/BonsaiData.pm,v $ 
 # $Name:  $ 
@@ -179,20 +179,23 @@ sub get_tree_state {
     (-d $dir) ||
         return 'Open';
 
+    my ($file);
+
     # find the current batch file
-    my ($file) = "$dir/batchid.pl";
+    $file = "$dir/batchid.pl";
     (-f $file) ||
         return 'Open';
 
     # find the current batch file
 
-    $current_batchid = get_file_variable($file, 'BatchID');
+    my $current_batchid = get_file_variable($file, 'BatchID');
 
     # get the tree state
-    my ($file) = "$dir/batch-${current_batchid}.pl";
+    $file = "$dir/batch-${current_batchid}.pl";
     (-f $file) ||
         return 'Open';
-    $is_tree_open = get_file_variable($file, 'TreeOpen');
+
+    my $is_tree_open = get_file_variable($file, 'TreeOpen');
 
     my ($tree_state) = ($is_tree_open ? 'Open' : 'Closed');
     return $tree_state;

webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm

@@ -40,8 +40,8 @@
 # Contributor(s): 
 
 
-# $Revision: 1.57 $ 
-# $Date: 2002/05/07 22:51:21 $ 
+# $Revision: 1.58 $ 
+# $Date: 2002/05/08 17:43:02 $ 
 # $Author: kestes%walrus.com $ 
 # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm,v $ 
 # $Name:  $ 
@@ -101,7 +101,7 @@ use TreeData;
 use VCDisplay;
 
 
-$VERSION = ( qw $Revision: 1.57 $ )[1];
+$VERSION = ( qw $Revision: 1.58 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -110,7 +110,7 @@ $VC_NAME = $TinderConfig::VC_NAME || "CVS";
 
 # how we recoginise bug number in the checkin comments.
 $VC_BUGNUM_REGEXP = $TinderConfig::VC_BUGNUM_REGEXP ||
-    "(\d\d\d+)";
+    '(\d\d\d+)';
 
 $EMPTY_TABLE_CELL = $HTMLPopUp::EMPTY_TABLE_CELL;
 
@@ -311,7 +311,7 @@ sub status_table_legend {
     my ($cell_color) = TreeData::TreeState2color($state);
     my ($char) = TreeData::TreeState2char($state);
     my ($description) = TreeData::TreeStates2descriptions($state);
-    my $description = "$state: $description";
+    $description = "$state: $description";
     my $text_browser_color_string = 
       HTMLPopUp::text_browser_color_string($cell_color, $char);
 
@@ -360,7 +360,6 @@ sub cell_data {
  
         ($db_index >= $#DB_TIMES) && last;
 
-       
         $db_index++;
         
         if (defined($DATABASE{$tree}{$time}{'treestate'})) {