AFBClient: remove call() method

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

diff --git a/AFBClient.cpp b/AFBClient.cpp
index 6fcb207..d3e3a5e 100644 (file)
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -92,6 +92,66 @@ void dispatch_internal(AFBClient *c, uint64_t timeout) {
     c->dispatch(timeout);
 }
 
+/// object will be json_object_put
+int api_call(AFBClient *c, struct afb_wsj1 *wsj1, const char *verb,
+             json_object *object,
+             std::function<void(bool, json_object *)> onReply) {
+    TRACE();
+
+    // We need to wrap the actual onReply call once in order to
+    // *look* like a normal functions pointer (std::functions<>
+    // with captures cannot convert to function pointers).
+    // Alternatively we could setup a local struct and use it as
+    // closure, but I think it is cleaner this way.
+    int call_rc = 0;
+    bool returned = false;
+    std::function<void(bool, json_object *)> wrappedOnReply =
+        [&returned, &call_rc, &onReply](bool ok, json_object *j) {
+            TRACEN(wrappedOnReply);
+            call_rc = ok ? 0 : -EINVAL;
+            // We know it failed, but there may be an explanation in the
+            // json object.
+            {
+                TRACEN(onReply);
+                onReply(ok, j);
+            }
+            returned = true;
+        };
+
+    // make the actual call, use wrappedOnReply as closure
+    int rc = afb_wsj1_call_j(
+        wsj1, wmAPI, verb, object,
+        [](void *closure, afb_wsj1_msg *msg) {
+            TRACEN(callClosure);
+            auto *onReply =
+                reinterpret_cast<std::function<void(bool, json_object *)> *>(
+                    closure);
+            (*onReply)(!!afb_wsj1_msg_is_reply_ok(msg),
+                       afb_wsj1_msg_object_j(msg));
+        },
+        &wrappedOnReply);
+
+    if (rc < 0) {
+        fprintf(
+            stderr, "calling %s/%s(%s) failed: %m\n", wmAPI, verb,
+            json_object_to_json_string_ext(object, JSON_C_TO_STRING_PRETTY));
+        // Call the reply handler regardless with a NULL json_object*
+        onReply(false, nullptr);
+    } else {
+        // We need to dispatch until "returned" got set, this is necessary
+        // if events get triggered by the call (and would be dispatched before
+        // the actual call-reply).
+        while (!returned) {
+            dispatch_internal(c, -1);
+        }
+
+        // return the actual API call result
+        rc = call_rc;
+    }
+
+    return rc;
+}
+
 }  // namespace
 
 AFBClient &AFBClient::instance() {
@@ -169,26 +229,28 @@ int AFBClient::requestSurface(const char *label) {
     json_object_object_add(jp, "drawing_name", json_object_new_string(label));
     int rc = -1;
     /* send the request */
-    int rc2 = call("request_surface", jp, [&rc](bool ok, json_object *j) {
-        if (ok) {
-            int id = json_object_get_int(json_object_object_get(j, "response"));
-            char *buf;
-            asprintf(&buf, "%d", id);
-            printf("setenv(\"QT_IVI_SURFACE_ID\", %s, 1)\n", buf);
-            if (setenv("QT_IVI_SURFACE_ID", buf, 1) != 0) {
-                fprintf(stderr, "putenv failed: %m\n");
-                rc = -errno;
+    int rc2 = api_call(
+        this, wsj1, "request_surface", jp, [&rc](bool ok, json_object *j) {
+            if (ok) {
+                int id =
+                    json_object_get_int(json_object_object_get(j, "response"));
+                char *buf;
+                asprintf(&buf, "%d", id);
+                printf("setenv(\"QT_IVI_SURFACE_ID\", %s, 1)\n", buf);
+                if (setenv("QT_IVI_SURFACE_ID", buf, 1) != 0) {
+                    fprintf(stderr, "putenv failed: %m\n");
+                    rc = -errno;
+                } else {
+                    rc = 0;  // Single point of success
+                }
             } else {
-                rc = 0;  // Single point of success
+                fprintf(stderr, "Could not get surface ID from WM: %s\n",
+                        j ? json_object_to_json_string_ext(
+                                j, JSON_C_TO_STRING_PRETTY)
+                          : "no-info");
+                rc = -EINVAL;
             }
-        } else {
-            fprintf(
-                stderr, "Could not get surface ID from WM: %s\n",
-                j ? json_object_to_json_string_ext(j, JSON_C_TO_STRING_PRETTY)
-                  : "no-info");
-            rc = -EINVAL;
-        }
-    });
+        });
 
     return rc2 < 0 ? rc2 : rc;
 }
@@ -197,7 +259,8 @@ int AFBClient::activateSurface(const char *label) {
     TRACE();
     json_object *j = json_object_new_object();
     json_object_object_add(j, "drawing_name", json_object_new_string(label));
-    return call("activate_surface", j, [](bool ok, json_object *j) {
+    return api_call(this, wsj1, "activate_surface", j, [](bool ok,
+                                                          json_object *j) {
         if (!ok) {
             fprintf(
                 stderr, "API Call activate_surface() failed: %s\n",
@@ -211,7 +274,8 @@ int AFBClient::deactivateSurface(const char *label) {
     TRACE();
     json_object *j = json_object_new_object();
     json_object_object_add(j, "drawing_name", json_object_new_string(label));
-    return call("deactivate_surface", j, [](bool ok, json_object *j) {
+    return api_call(this, wsj1, "deactivate_surface", j, [](bool ok,
+                                                            json_object *j) {
         if (!ok) {
             fprintf(
                 stderr, "API Call deactivate_surface() failed: %s\n",
@@ -225,7 +289,7 @@ int AFBClient::endDraw(const char *label) {
     TRACE();
     json_object *j = json_object_new_object();
     json_object_object_add(j, "drawing_name", json_object_new_string(label));
-    return call("enddraw", j, [](bool ok, json_object *j) {
+    return api_call(this, wsj1, "enddraw", j, [](bool ok, json_object *j) {
         if (!ok) {
             fprintf(
                 stderr, "API Call endDraw() failed: %s\n",
@@ -235,65 +299,6 @@ int AFBClient::endDraw(const char *label) {
     });
 }
 
-/// object will be json_object_put
-int AFBClient::call(const char *verb, json_object *object,
-                    std::function<void(bool, json_object *)> onReply) {
-    TRACE();
-
-    // We need to wrap the actual onReply call once in order to
-    // *look* like a normal functions pointer (std::functions<>
-    // with captures cannot convert to function pointers).
-    // Alternatively we could setup a local struct and use it as
-    // closure, but I think it is cleaner this way.
-    int call_rc = 0;
-    bool returned = false;
-    std::function<void(bool, json_object *)> wrappedOnReply =
-        [&returned, &call_rc, &onReply](bool ok, json_object *j) {
-            TRACEN(wrappedOnReply);
-            call_rc = ok ? 0 : -EINVAL;
-            // We know it failed, but there may be an explanation in the
-            // json object.
-            {
-                TRACEN(onReply);
-                onReply(ok, j);
-            }
-            returned = true;
-        };
-
-    // make the actual call, use wrappedOnReply as closure
-    int rc = afb_wsj1_call_j(
-        wsj1, wmAPI, verb, object,
-        [](void *closure, afb_wsj1_msg *msg) {
-            TRACEN(callClosure);
-            auto *onReply =
-                reinterpret_cast<std::function<void(bool, json_object *)> *>(
-                    closure);
-            (*onReply)(!!afb_wsj1_msg_is_reply_ok(msg),
-                       afb_wsj1_msg_object_j(msg));
-        },
-        &wrappedOnReply);
-
-    if (rc < 0) {
-        fprintf(
-            stderr, "calling %s/%s(%s) failed: %m\n", wmAPI, verb,
-            json_object_to_json_string_ext(object, JSON_C_TO_STRING_PRETTY));
-        // Call the reply handler regardless with a NULL json_object*
-        onReply(false, nullptr);
-    } else {
-        // We need to dispatch until "returned" got set, this is necessary
-        // if events get triggered by the call (and would be dispatched before
-        // the actual call-reply).
-        while (!returned) {
-            dispatch_internal(this, -1);
-        }
-
-        // return the actual API call result
-        rc = call_rc;
-    }
-
-    return rc;
-}
-
 void AFBClient::set_event_handler(enum EventType et,
                                   std::function<void(char const *)> func) {
     UNUSED(et);

diff --git a/AFBClient.h b/AFBClient.h
index c6da6f7..6625c44 100644 (file)
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -43,9 +43,6 @@ public:
           std::function<void(char const *label)> f);
 
 private:
-    int call(const char *verb, json_object *object,
-          std::function<void(bool ok, json_object*)> onReply);
-
     struct afb_wsj1 *wsj1;
     struct sd_event *loop;
 };