# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1615595786 -3600
# Node ID 17dae091eb33e0e84cb24d93283eb69711c84022
# Parent  a6b20a126635da78ca6656555d8afb3694695ea1
Made use of the common thread-related initialisation function.

diff -r a6b20a126635 -r 17dae091eb33 dstest_test_client.cc
--- a/dstest_test_client.cc	Thu Mar 11 23:51:02 2021 +0100
+++ b/dstest_test_client.cc	Sat Mar 13 01:36:26 2021 +0100
@@ -160,10 +160,17 @@
 
 int main(void)
 {
+  long err;
+
   /* Introduce concurrency control. */
 
-  ipc_cap_alloc_init();
-  ipc_mem_init();
+  err = ipc_thread_init();
+
+  if (err)
+  {
+    printf("Initialisation error: %s\n", l4sys_errtostr(err));
+    return 1;
+  }
 
   /* Retain activity and context details. */
 
@@ -180,7 +187,7 @@
 
   for (fileid = 0; fileid < NUMBER_OF_FILES; fileid++)
   {
-    long err = context_for_file(fileid, &contexts[fileid], server);
+    err = context_for_file(fileid, &contexts[fileid], server);
 
     if (err)
     {
diff -r a6b20a126635 -r 17dae091eb33 dstest_test_server.cc
--- a/dstest_test_server.cc	Thu Mar 11 23:51:02 2021 +0100
+++ b/dstest_test_server.cc	Sat Mar 13 01:36:26 2021 +0100
@@ -44,9 +44,17 @@
 
 int main(int argc, char *argv[])
 {
+  long err;
+
   /* Introduce concurrency control. */
 
-  ipc_cap_alloc_init();
+  err = ipc_thread_init();
+
+  if (err)
+  {
+    printf("Initialisation error: %s\n", l4sys_errtostr(err));
+    return 1;
+  }
 
   /* Configure the number of available pages using any argument. */
 
@@ -66,7 +74,7 @@
   /* Register a server associating it with the given object. */
 
   ResourceServer server(&opener);
-  long err = server.bind("server");
+  err = server.bind("server");
 
   if (err)
   {