# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1561823761 -7200
# Node ID cd038cc826d8b1ce5fc6936c5bf26ef5fa028df6
# Parent  c7f69acd746ab5e28fe825187144db26ee2794d4
Introduced convenience functions for filesystem object IPC handling.

diff -r c7f69acd746a -r cd038cc826d8 server/src/main.cc
--- a/server/src/main.cc	Sat Jun 29 16:45:10 2019 +0200
+++ b/server/src/main.cc	Sat Jun 29 17:56:01 2019 +0200
@@ -100,7 +100,7 @@
 
     /* Obtain the dataspace and IRQ object. */
 
-    err = fsdesc_import_dataspace(msg, 0, &desc.obj) || fsdesc_import_irq(msg, 1, &desc.obj);
+    err = fsdesc_import_object(msg, 0, &desc.obj);
     if (err)
     {
       ipc_message_send_error(msg, -L4_EIO);
@@ -136,9 +136,9 @@
       return;
     }
 
-    /* Free the capability and buffer from this task. */
+    /* Free the capabilities and buffer from this task. */
 
-    ipc_message_discard_dataspace(msg, desc.obj.ds, (l4_addr_t) desc.obj.buffer);
+    fsdesc_deallocate_object(&desc.obj);
 
     /* Return the file size. */