[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/cdk/printf...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       14/02/23 18:17:23

Modified files:
        distrib        : ChangeLog 
        src/utils/cdk  : printf2.ml printf2.mli 

Log message:
        patch #8331

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1590&r2=1.1591
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/printf2.ml?cvsroot=mldonkey&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/printf2.mli?cvsroot=mldonkey&r1=1.12&r2=1.13

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1590
retrieving revision 1.1591
diff -u -b -r1.1590 -r1.1591
--- distrib/ChangeLog   23 Feb 2014 18:16:44 -0000      1.1590
+++ distrib/ChangeLog   23 Feb 2014 18:17:23 -0000      1.1591
@@ -15,6 +15,7 @@
 =========
 
 2014/02/23:
+8331: printf2: add ?exn parameter for easy exception printing (ygrek)
 8330: printexc2: reduce complexity, drop unused code (ygrek)
 8329: printf2: reduce complexity, use Printf.ksprintf (ygrek)
 8328: gettext: reduce complexity, drop unused code (ygrek)

Index: src/utils/cdk/printf2.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/printf2.ml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/utils/cdk/printf2.ml    23 Feb 2014 18:16:11 -0000      1.24
+++ src/utils/cdk/printf2.ml    23 Feb 2014 18:17:23 -0000      1.25
@@ -34,10 +34,13 @@
       Printf.printf "%sMessage [%s] discarded\n" time s;
   )
 
+let show_exn = function None -> "" | Some exn -> Printf.sprintf " : %s" 
(Printexc.to_string exn)
 let lprintf fmt = Printf.ksprintf (fun s -> try !lprintf_handler "" s with _ 
-> ()) fmt
 let lprintf2 m fmt = Printf.ksprintf (fun s -> try !lprintf_handler (log_time 
()) (m^" "^s) with _ -> ()) fmt
-let lprintf_nl fmt = Printf.ksprintf (fun s -> try !lprintf_handler (log_time 
()) (s^"\n") with _ -> ()) fmt
-let lprintf_nl2 m fmt = Printf.ksprintf (fun s -> try !lprintf_handler 
(log_time ()) (m^" "^s^"\n") with _ -> ()) fmt
+let lprintf_nl ?exn fmt =
+  Printf.ksprintf (fun s -> try !lprintf_handler (log_time ()) (s^show_exn 
exn^"\n") with _ -> ()) fmt
+let lprintf_nl2 ?exn m fmt =
+  Printf.ksprintf (fun s -> try !lprintf_handler (log_time ()) (m^" 
"^s^show_exn exn^"\n") with _ -> ()) fmt
 
 let lprint_newline () = lprintf "\n"
 let lprint_char = lprintf "%c"

Index: src/utils/cdk/printf2.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/printf2.mli,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/utils/cdk/printf2.mli   23 Feb 2014 18:16:11 -0000      1.12
+++ src/utils/cdk/printf2.mli   23 Feb 2014 18:17:23 -0000      1.13
@@ -28,8 +28,8 @@
 
 val lprintf :  ('a, unit, string, unit) format4 -> 'a
 val lprintf2 :  string -> ('a, unit, string, unit) format4 -> 'a
-val lprintf_nl :  ('a, unit, string, unit) format4 -> 'a
-val lprintf_nl2 : string -> ('a, unit, string, unit) format4 -> 'a
+val lprintf_nl :  ?exn:exn -> ('a, unit, string, unit) format4 -> 'a
+val lprintf_nl2 : ?exn:exn -> string -> ('a, unit, string, unit) format4 -> 'a
 val lprint_newline : unit -> unit
 val lprint_char : char -> unit
 val lprint_string : string -> unit