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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/19 23:04:59

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverMain.ml 
        src/utils/lib  : gettext.ml4 

Log message:
        patch #5570

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1102&r2=1.1103
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.131&r2=1.132
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/gettext.ml4?cvsroot=mldonkey&r1=1.8&r2=1.9

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1102
retrieving revision 1.1103
diff -u -b -r1.1102 -r1.1103
--- distrib/ChangeLog   19 Nov 2006 23:04:25 -0000      1.1102
+++ distrib/ChangeLog   19 Nov 2006 23:04:59 -0000      1.1103
@@ -15,6 +15,7 @@
 =========
 
 2006/11/20
+5570: Some log messages in gettext module (Schlumpf)
 5569: HTML: Fix display bug in server list after js popups
       introduced by patch #5549 (Schlumpf)
 5564: HTML: Remove non-working option use_html_frames (Schlumpf)

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- src/daemon/driver/driverMain.ml     14 Nov 2006 11:23:11 -0000      1.131
+++ src/daemon/driver/driverMain.ml     19 Nov 2006 23:04:59 -0000      1.132
@@ -419,7 +419,7 @@
   lprintf_nl (_b "---- enabling interfaces ----");
   List.iter (fun (p,s) -> if p <> 0 then lprintf_nl "using port %d (%s)" p s)
     (network_ports (network_find_by_name "Global Shares"));
-  lprintf (_b "%sdisabled networks: ") (log_time ());
+  lprintf (_b "%s[dMain] disabled networks: ") (log_time ());
   let found = ref false in
     networks_iter_all (fun r ->
         if not (network_is_enabled r) then

Index: src/utils/lib/gettext.ml4
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/gettext.ml4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/utils/lib/gettext.ml4   24 Jul 2006 20:12:32 -0000      1.8
+++ src/utils/lib/gettext.ml4   19 Nov 2006 23:04:59 -0000      1.9
@@ -20,6 +20,14 @@
 open Printf2
 open Autoconf
 
+let log_prefix = "[Gettext]"
+
+let lprintf_nl fmt =
+  lprintf_nl2 log_prefix fmt
+
+let lprintf_n fmt =
+  lprintf2 log_prefix fmt
+
 type expected_types =
   Type_int
 | Type_char
@@ -291,7 +299,7 @@
       !verified.(index) <- true;
       true
     end else begin
-      lprintf "Bad format for %s\n" translated;
+      lprintf_nl "Bad format for %s\n" translated;
       save_strings_file := true;
       !translation.(index) <- no_translation;
       false
@@ -359,7 +367,7 @@
             
             save_strings_file := false)
         with e ->
-            lprintf "Gettext.save_strings: Error %s\n\n"
+            lprintf_nl "save_strings: Error %s"
               (Printexc2.to_string e)
 open Genlex2
 
@@ -404,7 +412,7 @@
         parse_file stream
       with e -> 
           strings_file_error := true;
-        lprintf "Gettext.set_strings_file: Exception %s in %s at pos %d\n"
+        lprintf_nl "set_strings_file: Exception %s in %s at pos %d"
           (Printexc2.to_string e) filename (Stream.count s))
     with e -> 
         save_strings_file := true);
@@ -420,7 +428,7 @@
     let strings = Hashtbl.create 111 in
     
 let translate1 s0 s1 =
-  lprintf "translate0 %s\n" s0;
+  lprintf_nl "translate0 %s" s0;
   Hashtbl.add strings s0 s1
 in
 
@@ -444,18 +452,18 @@
       parse_file stream 
     with e -> 
         strings_file_error := true;
-        lprintf "Gettext.set_strings_file: Exception %s in %s at pos %d\n"
+        lprintf_nl "set_strings_file: Exception %s in %s at pos %d"
            (Printexc2.to_string e) f1 (Stream.count s))
   with e -> 
     save_strings_file := true;
-    lprintf "Gettext.set_strings_file: no message file found. Creating one\n");
+    lprintf_nl "set_strings_file: no message file found. Creating one");
 
 let translate2 s0 s1 =
   try
-    lprintf "translate2 %s\n" s0;
+    lprintf_nl "translate2 %s" s0;
     let s0 = Hashtbl.find strings s0 in
     translate "Former Translation" s0 s1
-  with _ -> lprintf "No translation for %s\n" s0
+  with _ -> lprintf_nl "No translation for %s" s0
 in
     
 let rec parse_file = (parser
@@ -477,11 +485,11 @@
           parse_file stream 
         with e -> 
             strings_file_error := true; 
-            lprintf "Gettext.set_strings_file: Exception %s in %s at pos %d\n"
+            lprintf_nl "set_strings_file: Exception %s in %s at pos %d"
                (Printexc2.to_string e) f2 (Stream.count s))
      with e -> 
        save_strings_file := true;
-       lprintf "Gettext.set_strings_file: no message file found. Creating 
one\n"
+       lprintf_nl "set_strings_file: no message file found. Creating one"
     
     
   with _ -> ()