Some cleanup on the readfile function.

amatus · Jun 12, 2012 · c1ee0ac · c1ee0ac
1 parent 6dc5fa5
commit c1ee0ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/clojure/foofs/filesystem.clj b/src/clojure/foofs/filesystem.clj
@@ -161,14 +161,7 @@
           (continuation! {:handle 0
                           :flags 0})))))
   (readfile [_ {:keys [nodeid arg]} continuation!]
-    (let [offset (:offset arg)
-          size (:size arg)]
-      (.readfile
-        backend nodeid offset size
-        (fn [buffer]
-          (if (nil? buffer)
-            (continuation! errno-noent)
-            (continuation! buffer))))))
+    (.readfile backend nodeid (:offset arg) (:size arg) continuation!))
   (writefile [_ {:keys [nodeid arg]} continuation!]
     (.writefile
       backend nodeid (:offset arg) (:size arg) (:data arg) continuation!))

diff --git a/src/clojure/foofs/memorybackend.clj b/src/clojure/foofs/memorybackend.clj
@@ -83,7 +83,7 @@
   (readfile [_ nodeid offset size continuation!]
     (let [file (get-in (deref state-agent) [:file-table nodeid])]
       (if (nil? file)
-        (continuation! nil)
+        (continuation! errno-noent)
         (continuation! (take size (drop offset file))))))
   (writefile [_ nodeid offset size data continuation!]
     (send