# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1588711404 -7200
# Node ID dcca045f88fe5df2089ce652405f12bbfd574034
# Parent  c7660ed91a92341821fd20cf480fb9be3e472254
Introduced a separate buffer type for context state, used also by objects.

diff -r c7660ed91a92 -r dcca045f88fe server/src/main.cc
--- a/server/src/main.cc	Thu Apr 30 22:51:06 2020 +0200
+++ b/server/src/main.cc	Tue May 05 22:43:24 2020 +0200
@@ -82,7 +82,7 @@
 
     /* Return a reference to any directly-accessed object. */
 
-    char *path = fsdesc_get_name(fsobj);
+    char *path = fsdesc_get_name(&fsobj->buffer);
 
     if ((path != NULL) && !strlen(path))
     {
@@ -99,7 +99,7 @@
 
     /* Find the path within the selected filesystem. */
 
-    strcpy(desc.cobj.buffer, fsobj->buffer);
+    strcpy(desc.cobj.addr, fsobj->buffer.addr);
 
     /* Propagate the message to the identified filesystem.
        The L4_MSGTAG_PROPAGATE flag is not supported by Fiasco.OC, so this
@@ -130,7 +130,7 @@
   {
     /* Obtain the object's path. */
 
-    char *path = fsdesc_get_name(fsobj);
+    char *path = fsdesc_get_name(&fsobj->buffer);
 
     if (path == NULL)
       return -L4_EINVAL;
@@ -165,7 +165,7 @@
 
     /* Find the path within the selected filesystem. */
 
-    strcpy(desc.cobj.buffer, fsobj->buffer);
+    strcpy(desc.cobj.addr, fsobj->buffer.addr);
 
     /* Propagate the message to the identified filesystem.
        The L4_MSGTAG_PROPAGATE flag is not supported by Fiasco.OC, so this
@@ -197,11 +197,11 @@
 
   /* Initialise a descriptor for accessing a mounted filesystem. */
 
-  long init_desc(file_descriptor_t *desc, fs_object_t *obj)
+  long init_desc(file_descriptor_t *desc, fs_object_t *fsobj)
   {
     /* Match the path to a mountpoint. */
 
-    char *path = fsdesc_get_name(obj);
+    char *path = fsdesc_get_name(&fsobj->buffer);
 
     if (path == NULL)
       return -L4_EINVAL;