From 944fb89e41da9a423a9b515c25cdbc4bdc806f14 Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep.foundation>
Date: Fri, 5 Oct 2018 08:49:22 +0200
Subject: [PATCH] somewhat cleaner

---
 Adapter.cc      | 36 ++++++++++++++++++------------------
 Adapter.hh      |  2 --
 test_adapter.cc |  2 +-
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Adapter.cc b/Adapter.cc
index 7aae398..035fc4c 100644
--- a/Adapter.cc
+++ b/Adapter.cc
@@ -6,10 +6,26 @@
 #include <iomanip>
 #include <assert.h>
 
+using namespace std;
+
 namespace pEp {
-    namespace Adapter {
-        using namespace std;
+    void throw_status(PEP_STATUS status)
+    {
+        if (status == PEP_STATUS_OK)
+            return;
+        if (status >= 0x400 && status <= 0x4ff)
+            return;
+        if (status == PEP_OUT_OF_MEMORY)
+            throw bad_alloc();
+        if (status == PEP_ILLEGAL_VALUE)
+            throw invalid_argument("illegal value");
+
+        stringstream build;
+        build << setfill('0') << "p≡p 0x" << setw(4) << hex << status;
+        throw runtime_error(build.str());
+    }
 
+    namespace Adapter {
         static messageToSend_t _messageToSend = nullptr;
         static notifyHandshake_t _notifyHandshake = nullptr;
         static std::thread *_sync_thread = nullptr;
@@ -26,22 +42,6 @@ namespace pEp {
             return m;
         }
 
-        void throw_status(PEP_STATUS status)
-        {
-            if (status == PEP_STATUS_OK)
-                return;
-            if (status >= 0x400 && status <= 0x4ff)
-                return;
-            if (status == PEP_OUT_OF_MEMORY)
-                throw bad_alloc();
-            if (status == PEP_ILLEGAL_VALUE)
-                throw invalid_argument("illegal value");
-
-            stringstream build;
-            build << setfill('0') << "p≡p 0x" << setw(4) << hex << status;
-            throw runtime_error(build.str());
-        }
-
         static int _inject_sync_event(SYNC_EVENT ev, void *management)
         {
             if (is_sync_thread(session())) {
diff --git a/Adapter.hh b/Adapter.hh
index 985e81f..04b0cfc 100644
--- a/Adapter.hh
+++ b/Adapter.hh
@@ -11,8 +11,6 @@ namespace pEp {
     void throw_status(PEP_STATUS status);
 
     namespace Adapter {
-        void throw_status(PEP_STATUS status);
-
         void startup(messageToSend_t messageToSend,
                 notifyHandshake_t notifyHandshake, void *obj = nullptr);
 
diff --git a/test_adapter.cc b/test_adapter.cc
index 1c80c88..4753f2a 100644
--- a/test_adapter.cc
+++ b/test_adapter.cc
@@ -29,7 +29,7 @@ int main()
     assert(me);
     PEP_STATUS status = myself(session(), me);
     free_identity(me);
-    throw_status(status);
+    pEp::throw_status(status);
 
     cout << "starting the adapter including sync\n";
     startup(messageToSend, notifyHandshake);