# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1626042427 -7200
# Node ID fee8fdde3ae1aeffbed99e96cc784a3f72567c6a
# Parent  838adec639f9b8a735b3da1863be40b88d375f93
Renamed client_open_device to client_open_using, adding a corresponding pipe
opening function.

diff -r 838adec639f9 -r fee8fdde3ae1 libext2fs_blockserver/lib/src/blockserver_io.c
--- a/libext2fs_blockserver/lib/src/blockserver_io.c	Sun Jul 11 23:55:34 2021 +0200
+++ b/libext2fs_blockserver/lib/src/blockserver_io.c	Mon Jul 12 00:27:07 2021 +0200
@@ -124,7 +124,7 @@
 {
   /* Open a device via the named capability. */
 
-  file_t *file = client_open_device(blockserver_default_cap, name, flags);
+  file_t *file = client_open_using(name, flags, blockserver_default_cap);
 
   /* NOTE: May want a more appropriate error code. */
 
diff -r 838adec639f9 -r fee8fdde3ae1 libfsclient/include/fsclient/client.h
--- a/libfsclient/include/fsclient/client.h	Sun Jul 11 23:55:34 2021 +0200
+++ b/libfsclient/include/fsclient/client.h	Mon Jul 12 00:27:07 2021 +0200
@@ -31,8 +31,9 @@
 
 void client_close(file_t *file);
 file_t *client_open(const char *name, flags_t flags);
-file_t *client_open_device(const char *cap, const char *name, flags_t flags);
+file_t *client_open_using(const char *name, flags_t flags, const char *cap);
 long client_pipe(file_t **reader, file_t **writer);
+long client_pipe_using(file_t **reader, file_t **writer, const char *cap);
 
 /* File and region operations. */
 
diff -r 838adec639f9 -r fee8fdde3ae1 libfsclient/lib/src/client.cc
--- a/libfsclient/lib/src/client.cc	Sun Jul 11 23:55:34 2021 +0200
+++ b/libfsclient/lib/src/client.cc	Mon Jul 12 00:27:07 2021 +0200
@@ -160,12 +160,12 @@
 
 file_t *client_open(const char *name, flags_t flags)
 {
-  return client_open_device("server", name, flags);
+  return client_open_using(name, flags, "server");
 }
 
 /* Open a filesystem object via a named capability. */
 
-file_t *client_open_device(const char *cap, const char *name, flags_t flags)
+file_t *client_open_using(const char *name, flags_t flags, const char *cap)
 {
   file_t *file = (file_t *) malloc(sizeof(file_t));
 
@@ -189,6 +189,11 @@
 
 long client_pipe(file_t **reader, file_t **writer)
 {
+  return client_pipe_using(reader, writer, "pipes");
+}
+
+long client_pipe_using(file_t **reader, file_t **writer, const char *cap)
+{
   *reader = (file_t *) malloc(sizeof(file_t));
 
   if (*reader == NULL)
@@ -202,7 +207,7 @@
     return -L4_ENOMEM;
   }
 
-  l4_cap_idx_t server = l4re_env_get_cap("pipes");
+  l4_cap_idx_t server = l4re_env_get_cap(cap);
 
   long err = pipe_open(DEFAULT_PIPE_SIZE, *reader, *writer, server);