From 481d73fc86be51c10152e38b1fcef40c373326bf Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Tue, 30 Nov 2010 20:41:58 +0300
Subject: [PATCH] Simplify reloading

---
 link.c  | 8 ++------
 main.ml | 8 +-------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/link.c b/link.c
index 0392979..0e6c528 100644
--- a/link.c
+++ b/link.c
@@ -961,17 +961,13 @@ mainloop (void *unused)
         }
         else if (!strncmp ("free", p, 4)) {
             void *ptr;
-            int remove;
 
-            ret = sscanf (p + 4, " %p %d", &ptr, &remove);
-            if (ret != 2) {
+            ret = sscanf (p + 4, " %p", &ptr);
+            if (ret != 1) {
                 errx (1, "malformed free `%.*s' ret=%d", len, p, ret);
             }
             unlinkpage (ptr);
             state.pig = ptr;
-            if (remove)  {
-                freepage (ptr);
-            }
         }
         else if (!strncmp ("search", p, 6)) {
             int icase, pageno, y, ret, len2, forward;
diff --git a/main.ml b/main.ml
index 1b3f556..80cdabf 100644
--- a/main.ml
+++ b/main.ml
@@ -623,7 +623,7 @@ let act cmd =
             (fun k v a -> if v = opaque then k else a)
             state.pagemap (-1, -1, -1)
         in
-        wcmd "free" [`s opaque; `i 0];
+        wcmd "free" [`s opaque];
         Hashtbl.remove state.pagemap k
       );
       cbput state.pagecache p;
@@ -889,12 +889,6 @@ let doreshape w h =
 let opendoc path =
   invalidate ();
   state.path <- path;
-  for i = 0 to cblen state.pagecache - 1 do
-    let opaque = cbget state.pagecache 1 in
-    cbput state.pagecache "";
-    if validopaque opaque
-    then wcmd "free" [`s opaque; `i 1];
-  done;
   Hashtbl.clear state.pagemap;
 
   writecmd state.csock ("open " ^ path ^ "\000");
-- 
2.11.4.GIT