[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr... |
Date: |
Thu, 07 Sep 2006 10:55:11 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/09/07 10:55:11
Modified files:
distrib : ChangeLog
src/daemon/driver: driverInteractive.ml
Log message:
patch #5369
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.996&r2=1.997
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.100&r2=1.101
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.996
retrieving revision 1.997
diff -u -b -r1.996 -r1.997
--- distrib/ChangeLog 5 Sep 2006 15:32:17 -0000 1.996
+++ distrib/ChangeLog 7 Sep 2006 10:55:11 -0000 1.997
@@ -14,6 +14,9 @@
ChangeLog
=========
+2006/09/07
+5369: Portinfo: fix String.length problems in Telnet (5369_2.patch)
+
2006/09/05
5294: HTML: Fix sources display for Gnutella/G2/Fasttrack/Filetp
broken by patch #5294 (thx to z)
Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- src/daemon/driver/driverInteractive.ml 5 Sep 2006 14:18:24 -0000
1.100
+++ src/daemon/driver/driverInteractive.ml 7 Sep 2006 10:55:11 -0000
1.101
@@ -2039,11 +2039,11 @@
}
let portinfo html buf =
- let max_network_name_len = ref 4 in (* "Core" *)
+ let network_name_list_width = ref 7 in (* "Network" *)
let list = ref [] in
networks_iter (fun r ->
- if String.length r.network_name > !max_network_name_len then
- max_network_name_len := String.length r.network_name;
+ if String.length r.network_name > !network_name_list_width then
+ network_name_list_width := String.length r.network_name;
List.iter (fun (p,s) -> if p <> 0 then list := !list @
[{netname = r.network_name; port = p; portname = s}]) (network_ports r)
);
@@ -2051,7 +2051,7 @@
[{netname = "Core"; port = p; portname = s}])
(network_ports (network_find_by_name "Global Shares"));
- let fill_network s = String.make (!max_network_name_len - 7) s in
+ let fill_network s = String.make (max 0 (!network_name_list_width - 7)) s in
if html then
html_mods_table_header buf "sharesTable" "shares" [
( "0", "srh", "Network", "Network" ) ;
@@ -2071,7 +2071,7 @@
(html_mods_cntr ()) p.netname p.port p.portname
else
Printf.bprintf buf "%-*s|%6d|%s\n"
- (maxi !max_network_name_len (!max_network_name_len - String.length
p.netname)) p.netname p.port p.portname
+ (max !network_name_list_width (!network_name_list_width - String.length
p.netname)) p.netname p.port p.portname
) (List.sort (fun p1 p2 -> String.compare p1.netname p2.netname) !list);
if html then
Printf.bprintf buf "\\</table\\>\\</td\\>\\<tr\\>\\</table\\>\\</div\\>"
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/01
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/01
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/01
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/03
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/03
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/13
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/13
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/16
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/23
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr..., mldonkey-commits, 2006/09/23