Imported Upstream version 3.3.1

[debian/amanda] / perl / Amanda / Logfile.pm

diff --git a/perl/Amanda/Logfile.pm b/perl/Amanda/Logfile.pm
index 8a18a8e4778c4def2cea99d44666890c9e57ff68..8d36cfbb84e790c04680dba7e28c38899b5ca7e9 100644 (file)
--- a/perl/Amanda/Logfile.pm
+++ b/perl/Amanda/Logfile.pm
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.39
+# Version 2.0.4
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
@@ -61,10 +61,6 @@ package Amanda::Logfile;
 *search_holding_disk = *Amanda::Logfilec::search_holding_disk;
 *dumps_match = *Amanda::Logfilec::dumps_match;
 *dumps_match_dumpspecs = *Amanda::Logfilec::dumps_match_dumpspecs;
-*match_host = *Amanda::Logfilec::match_host;
-*match_disk = *Amanda::Logfilec::match_disk;
-*match_datestamp = *Amanda::Logfilec::match_datestamp;
-*match_level = *Amanda::Logfilec::match_level;
 
 ############# Class : Amanda::Logfile::find_result_t ##############
 
@@ -110,6 +106,8 @@ sub DESTROY {
 *swig_totalparts_set = *Amanda::Logfilec::find_result_t_totalparts_set;
 *swig_sec_get = *Amanda::Logfilec::find_result_t_sec_get;
 *swig_sec_set = *Amanda::Logfilec::find_result_t_sec_set;
+*swig_bytes_get = *Amanda::Logfilec::find_result_t_bytes_get;
+*swig_bytes_set = *Amanda::Logfilec::find_result_t_bytes_set;
 *swig_kb_get = *Amanda::Logfilec::find_result_t_kb_get;
 *swig_kb_set = *Amanda::Logfilec::find_result_t_kb_set;
 *swig_orig_kb_get = *Amanda::Logfilec::find_result_t_orig_kb_get;
@@ -363,16 +361,6 @@ the same result, that result will be returned multiple times.
 
 All of these functions can be imported by name.
 
-=head1 MATCHING
-
-The following functions are available to match strings against patterns using
-the rules described in amanda(8):
-
-  match_host($pat, $str);
-  match_disk($pat, $str);
-  match_datestamp($pat, $str);
-  match_level($pat, $str);
-
 =head1 DEBUG LOGGING HANDLER
 
 This package provides C<$amanda_log_trace_log>, which sends C<die>
@@ -608,8 +596,7 @@ $_program_t_VALUES{"P_AMVAULT"} = $P_AMVAULT;
 #copy symbols in program_t to constants
 push @{$EXPORT_TAGS{"constants"}},  @{$EXPORT_TAGS{"program_t"}};
 
-push @EXPORT_OK, qw(find_log search_logfile dumps_match log_rename
-    match_host match_disk match_datestamp match_level);
+push @EXPORT_OK, qw(find_log search_logfile dumps_match log_rename);
 
 push @EXPORT_OK, qw($amanda_log_trace_log);
 
@@ -672,9 +659,9 @@ sub make_stats {
     my $kps = "$kb.0"/$duration; # Perlish cast from BigInt to float
 
     if (defined $orig_kb) {
-       return sprintf("[sec %f kb %d kps %f orig-kb %d]", $duration, $kb, $kps, $orig_kb);
+       return sprintf("[sec %f bytes %s kps %f orig-kb %s]", $duration, $size, $kps, $orig_kb);
     } else {
-       return sprintf("[sec %f kb %d kps %f]", $duration, $kb, $kps);
+       return sprintf("[sec %f bytes %s kps %f]", $duration, $size, $kps);
     }
 }