Merge tag 'upstream/3.3.3'

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

diff --git a/perl/Amanda/Logfile.swg b/perl/Amanda/Logfile.swg
index 69b0846ab720a3b3acf41822412b4cac2ab01f22..a461adb3216a1086e42b3e4abeb6f0be96d86487 100644 (file)
--- a/perl/Amanda/Logfile.swg
+++ b/perl/Amanda/Logfile.swg
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2007, 2008, 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -153,6 +154,7 @@ typedef struct {
     int partnum;
     int totalparts;
     double sec;
+    off_t bytes;
     off_t kb;
     off_t orig_kb;
     %mutable;
@@ -250,7 +252,6 @@ typedef struct {
 
 amglue_export_ok(
     find_log search_logfile dumps_match log_rename
-    match_host match_disk match_datestamp match_level
 );
 
 char **find_log(void);
@@ -288,13 +289,6 @@ find_result_t *dumps_match_dumpspecs(find_result_t *output_find,
     amglue_dumpspec_list *dumpspecs,
     gboolean ok);
 
-/* these are actually available for clients as well, but they do not deserve
- * their own perl module, so they're stuck here */
-gboolean match_host(char *pat, char *value);
-gboolean match_disk(char *pat, char *value);
-gboolean match_datestamp(char *pat, char *value);
-gboolean match_level(char *pat, char *value);
-
 %immutable;
 amanda_log_handler_t *amanda_log_trace_log;
 %mutable;
@@ -365,9 +359,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);
     }
 }