import torrus 1.0.9

[freeside.git] / FS / FS / UI / bytecount.pm

diff --git a/FS/FS/UI/bytecount.pm b/FS/FS/UI/bytecount.pm
index d278dbe..7e78bf5 100644 (file)
--- a/FS/FS/UI/bytecount.pm
+++ b/FS/FS/UI/bytecount.pm
@@ -1,10 +1,15 @@
 package FS::UI::bytecount;
 
 use strict;
-use vars qw($DEBUG $me);
+use vars qw($DEBUG $me @ISA @EXPORT_OK);
+use Exporter;
 use FS::Conf;
 use Number::Format 1.50;
 
+@ISA = qw( Exporter );
+
+@EXPORT_OK = qw( bytecount_unexact parse_bytecount display_bytecount );
+
 $DEBUG = 0;
 $me = '[FS::UID::bytecount]';
 
@@ -31,11 +36,11 @@ sub bytecount_unexact {
   my $bc = shift;
   return("$bc bytes")
     if ($bc < 1000);
-  return(sprintf("%.2f Kbytes", $bc/1000))
-    if ($bc < 1000000);
-  return(sprintf("%.2f Mbytes", $bc/1000000))
-    if ($bc < 1000000000);
-  return(sprintf("%.2f Gbytes", $bc/1000000000));
+  return(sprintf("%.2f Kbytes", $bc/1024))
+    if ($bc < 1048576);
+  return(sprintf("%.2f Mbytes", $bc/1048576))
+    if ($bc < 1073741824);
+  return(sprintf("%.2f Gbytes", $bc/1073741824));
 }
 
 =item parse_bytecount AMOUNT