Consistency and correct(erer)ness

malc committed 4 years ago

Commit cef17441 parent 4e21d744 files · +8 −9Browse files

Unified · Split

4 files

@@ -1465,7 +1465,7 @@ let gc () = · 1464 unmodified lines
1465	let cref = ref defconf in	1465	let cref = ref defconf in
1466	let push (h, dc) =	1466	let push (h, dc) =
1467	let f path v =	1467	let f path v =
1468	if Sys.file_exists path then Some v else (dolog1 "-%S" path; None)	1468	if Sys.file_exists path then Some v else (dolog "removing %S" path; None)
1469	in	1469	in
1470	Hashtbl.filter_map_inplace f h;	1470	Hashtbl.filter_map_inplace f h;
1471	href := h;	1471	href := h;

   gotopagexy pageno x y
 let act cmds =
-  (* dolog1 "%S" cmds; *)
+  (* dolog "%S" cmds; *)
   let spl = splitatchar cmds ' ' in
   let scan s fmt f =
     try Scanf.sscanf s fmt f
     with exn ->
-      dolog1 "error scanning %S: %s" cmds @@ exntos exn;
+      dolog "error scanning %S: %s" cmds @@ exntos exn;
       exit 1
   in
   let addoutline outline =
     | Outlining outlines -> S.currently := Outlining (outline :: outlines)
     | Idle -> S.currently := Outlining [outline]
     | Loading _ | Tiling _ ->
-       dolog1 "invalid outlining state";
+       dolog "Invalid outlining state";
        logcurrently !S.currently
   in
   match spl with
         )
      | Idle | Tiling _ | Outlining _ ->
-        dolog1 "Inconsistent loading state";
+        dolog "Inconsistent loading state";
         logcurrently !S.currently;
         exit 1
      end
         )
      | Idle | Loading _ | Outlining _ ->
-        dolog1 "Inconsistent tiling state";
+        dolog "Inconsistent tiling state";
         logcurrently !S.currently;
         exit 1
      end
   let optrfd =
     ref (if nonemptystr !rcmdpath then remoteopen !rcmdpath else None)
   in
-  dologf := (adderrfmt "stderr" "%s\n");
+  if !S.redirstderr
+  then dologf := (adderrfmt "stderr" "%s\n");
   let fdl =
     let l = [!S.ss; !S.wsfd] in if !S.redirstderr then !S.stderr :: l else l

@@ -18,7 +18,6 @@ external hasdata : Unix.file_descr -> bool = "ml_hasdata" · 17 unmodified lines
18	let now = Unix.gettimeofday	18	let now = Unix.gettimeofday
19	let dologf = ref prerr_endline	19	let dologf = ref prerr_endline
20	let dolog fmt = Printf.ksprintf !dologf fmt	20	let dolog fmt = Printf.ksprintf !dologf fmt
21	let dolog1 fmt = Printf.ksprintf (fun s -> print_endline s; flush stdout) fmt
22		21
23	let exntos = function	22	let exntos = function
24	\| Unix.Unix_error (e, s, a) ->	23	\| Unix.Unix_error (e, s, a) ->

@@ -12,7 +12,6 @@ external hasdata : Unix.file_descr -> bool = "ml_hasdata" · 11 unmodified lines
12	val now : unit -> float	12	val now : unit -> float
13	val dologf : (string -> unit) ref	13	val dologf : (string -> unit) ref
14	val dolog : ('a, unit, string, unit) format4 -> 'a	14	val dolog : ('a, unit, string, unit) format4 -> 'a
15	val dolog1 : ('a, unit, string, unit) format4 -> 'a
16	val exntos : exn -> string	15	val exntos : exn -> string
17	val onoffs : bool -> string	16	val onoffs : bool -> string
18	val error : ('a, unit, string, 'b) format4 -> 'a	17	val error : ('a, unit, string, 'b) format4 -> 'a

Keyboard shortcuts