[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/12 18:12:03

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverInteractive.ml 

Log message:
        patch #5296

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.951&r2=1.952
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.90&r2=1.91

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.951
retrieving revision 1.952
diff -u -b -r1.951 -r1.952
--- distrib/ChangeLog   11 Aug 2006 08:46:42 -0000      1.951
+++ distrib/ChangeLog   12 Aug 2006 18:12:03 -0000      1.952
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/08/12
+5296: Telnet: Fix filesize display for 1kb, 1mb, 1gb values
+
 2006/08/11
 5295: Hard-coded minimum of 600s for min_reask_delay
 

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- src/daemon/driver/driverInteractive.ml      14 Jul 2006 14:23:37 -0000      
1.90
+++ src/daemon/driver/driverInteractive.ml      12 Aug 2006 18:12:03 -0000      
1.91
@@ -884,11 +884,11 @@
   Printf.bprintf buf "\\</form\\>"
 
 let print_human_readable file size =
- (if Int64.to_float size > 1024. && Int64.to_float size < 1048576. then
+ (if Int64.to_float size >= 1024. && Int64.to_float size < 1048576. then
     (Printf.sprintf "%5.1f%s" (Int64.to_float size /. 1024.) ("kb") )
-  else if size > Int64.of_float 1048576. && Int64.to_float size < 1073741824. 
then
+  else if size >= Int64.of_float 1048576. && Int64.to_float size < 1073741824. 
then
     (Printf.sprintf "%5.1f%s" (Int64.to_float size /. 1048576.) ("mb") )
-  else if size > Int64.of_float 1073741824. then
+  else if size >= Int64.of_float 1073741824. then
     (Printf.sprintf "%5.1f%s" (Int64.to_float size /. 1073741824.) ("gb") )
   else if size < Int64.zero then
     (Printf.sprintf "%d chunks"