From 2b0a69cb0541dc4307418ef31ceac70c8ffab26a Mon Sep 17 00:00:00 2001
From: malc <moosotc@gmail.com>
Date: Sun, 27 May 2018 07:43:15 +0300
Subject: [PATCH] Consistency

---
 config.ml      |  5 ++---
 listview.ml    |  5 ++---
 main.ml        | 11 ++++-------
 parser.ml      |  5 ++---
 wsi/x11/wsi.ml | 15 ++++++---------
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/config.ml b/config.ml
index fa71461..2daa43f 100644
--- a/config.ml
+++ b/config.ml
@@ -1165,9 +1165,8 @@ let load openlast =
            let exception E of (conf * outline list * int * anchor * string) in
            let key = try Digest.file absname |> Digest.to_hex with _ -> E.s in
            match (
-             if emptystr key
-             then ()
-             else
+             if nonemptystr key
+             then
                Hashtbl.iter (fun p ((c, _, _, _, _) as v) ->
                    if c.key = key
                    then (
diff --git a/listview.ml b/listview.ml
index 1c409c7..7d3b627 100644
--- a/listview.ml
+++ b/listview.ml
@@ -269,9 +269,8 @@ object (self)
     );
     let x0 = 0.0 and x1 = float (state.winw - conf.scrollbw - 1) in
     let rec loop row =
-      if (row - m_first) > fstate.maxrows
-      then ()
-      else (
+      if not ((row - m_first) > fstate.maxrows)
+      then (
         if row >= 0 && row < itemcount
         then (
           let (s, level) = source#getitem row in
diff --git a/main.ml b/main.ml
index 70b3057..1e773f9 100644
--- a/main.ml
+++ b/main.ml
@@ -405,9 +405,8 @@ let itertiles l f =
   let row = l.pagey / conf.tileh in
 
   let rec rowloop row y0 dispy h =
-    if h = 0
-    then ()
-    else (
+    if h != 0
+    then
       let dh = conf.tileh - y0 in
       let dh = min h dh in
       let rec colloop col x0 dispx w =
@@ -420,7 +419,6 @@ let itertiles l f =
       in
       colloop col tilex l.pagedispx l.pagevw;
       rowloop (row+1) 0 (dispy+dh) (h-dh)
-    )
   in
   if l.pagevw > 0 && l.pagevh > 0
   then rowloop row tiley l.pagedispy l.pagevh;
@@ -884,9 +882,8 @@ let docolumns columns =
   | Csingle _ ->
      let a = Array.make state.pagecount (-1, -1, -1, (-1, -1, -1, -1)) in
      let rec loop pageno pdimno pdim y ph pdims =
-       if pageno = state.pagecount
-       then ()
-       else
+       if pageno != state.pagecount
+       then
          let pdimno, ((_, w, h, xoff) as pdim), pdims =
            match pdims with
            | ((pageno', _, _, _) as pdim) :: rest when pageno' = pageno ->
diff --git a/parser.ml b/parser.ml
index 3ef21e8..903a9d8 100644
--- a/parser.ml
+++ b/parser.ml
@@ -52,9 +52,8 @@ let enent s pos len =
 
 let unent b s pos len =
   let rec loop i =
-    if i = pos + len
-    then ()
-    else
+    if i != pos + len
+    then
       let amppos =
         try
           String.index_from s i '&'
diff --git a/wsi/x11/wsi.ml b/wsi/x11/wsi.ml
index 01c8010..3b42a65 100644
--- a/wsi/x11/wsi.ml
+++ b/wsi/x11/wsi.ml
@@ -218,9 +218,8 @@ let updmodmap sock resp =
       then
         let p = l*n in
         let rec loop1 m =
-          if m = n
-          then ()
-          else
+          if m != n
+          then
             let p = p+m in
             let code = r8 data p in
             modmap.(l).(m) <- code;
@@ -231,9 +230,8 @@ let updmodmap sock resp =
               then
                 let a = state.keymap.(ki) in
                 let rec capsloop i =
-                  if i = Array.length a || i > 3
-                  then ()
-                  else
+                  if not (i = Array.length a || i > 3)
+                  then
                     let s = a.(i) in
                     if s = 0xffe5
                     then state.capslmask <- 2
@@ -249,9 +247,8 @@ let updmodmap sock resp =
                 then
                   let a = state.keymap.(ki) in
                   let rec lloop i =
-                    if i = Array.length a || i > 3
-                    then ()
-                    else
+                    if not (i = Array.length a || i > 3)
+                    then
                       let s = a.(i) in
                       match s with
                       | 0xfe03 -> state.levl3mask <- 1 lsl l
-- 
2.11.4.GIT