[plc4x] 02/02: - Removed the "_types" part from the promise related functions

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/c-api
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 2b8a2214d64f420182845faf8a96723bae46490c
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Apr 23 11:01:47 2020 +0200

    - Removed the "_types" part from the promise related functions
---
 sandbox/plc4c/api/src/main/include/plc4c_types.h            | 10 +++++-----
 sandbox/plc4c/examples/hello-world/src/main/c/hello_world.c |  8 +++-----
 sandbox/plc4c/spi/src/main/c/plc4c_types.c                  | 12 ++++++------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/sandbox/plc4c/api/src/main/include/plc4c_types.h b/sandbox/plc4c/api/src/main/include/plc4c_types.h
index 849ad07..84c6645 100644
--- a/sandbox/plc4c/api/src/main/include/plc4c_types.h
+++ b/sandbox/plc4c/api/src/main/include/plc4c_types.h
@@ -83,35 +83,35 @@ typedef void (*plc4c_failure_callback)(plc4c_promise *promise);
  * @param promise the promise to set the callback on
  * @param successCallback the callback
  */
-void plc4c_types_promise_set_success_callback(plc4c_promise* promise, plc4c_success_callback successCallback);
+void plc4c_promise_set_success_callback(plc4c_promise* promise, plc4c_success_callback successCallback);
 
 /**
  * Function to register a failure callback on a given plc4c_promise.
  * @param promise the promise to set the callback on
  * @param successCallback the callback
  */
-void plc4c_types_promise_set_failure_callback(plc4c_promise* promise, plc4c_failure_callback failureCallback);
+void plc4c_promise_set_failure_callback(plc4c_promise* promise, plc4c_failure_callback failureCallback);
 
 /**
  * Check if a promise is completed
  * @param promise the promise
  * @return true if the promise is in a final state
  */
-bool plc4c_types_promise_completed(plc4c_promise* promise);
+bool plc4c_promise_completed(plc4c_promise* promise);
 
 /**
  * Check if a promise is completed successfully
  * @param promise the promise
  * @return true if the promise is the state OK
  */
-bool plc4c_types_promise_completed_successfully(plc4c_promise* promise);
+bool plc4c_promise_completed_successfully(plc4c_promise* promise);
 
 /**
  * Check if a promise is completed unsuccessfully
  * @param promise the promise
  * @return true if the promise is in a final state other than OK
  */
-bool plc4c_types_promise_completed_unsuccessfully(plc4c_promise* promise);
+bool plc4c_promise_completed_unsuccessfully(plc4c_promise* promise);
 
 
 #ifdef __cplusplus
diff --git a/sandbox/plc4c/examples/hello-world/src/main/c/hello_world.c b/sandbox/plc4c/examples/hello-world/src/main/c/hello_world.c
index 666f3b5..eefb095 100644
--- a/sandbox/plc4c/examples/hello-world/src/main/c/hello_world.c
+++ b/sandbox/plc4c/examples/hello-world/src/main/c/hello_world.c
@@ -59,9 +59,9 @@ int main() {
     // Establish connections to remote devices
     // you may or may not care about the connection handle
     plc4c_promise* connect_promise = plc4c_system_connect(system, "s7://192.168.42.20", &connection);
-    plc4c_types_promise_set_success_callback(connect_promise, &onLocalConnectionSuccess);
-    plc4c_types_promise_set_failure_callback(connect_promise, &onLocalConnectionFailure);
-    if (plc4c_types_promise_completed_unsuccessfully(connect_promise)) {
+    plc4c_promise_set_success_callback(connect_promise, &onLocalConnectionSuccess);
+    plc4c_promise_set_failure_callback(connect_promise, &onLocalConnectionFailure);
+    if (plc4c_promise_completed_unsuccessfully(connect_promise)) {
         return -1;
     }
 
@@ -70,8 +70,6 @@ int main() {
         if (plc4c_system_loop(system) != OK) {
             break;
         }
-
-
     }
 
     // Make sure everything is cleaned up correctly.
diff --git a/sandbox/plc4c/spi/src/main/c/plc4c_types.c b/sandbox/plc4c/spi/src/main/c/plc4c_types.c
index ce3e6d0..c82eba6 100644
--- a/sandbox/plc4c/spi/src/main/c/plc4c_types.c
+++ b/sandbox/plc4c/spi/src/main/c/plc4c_types.c
@@ -24,23 +24,23 @@ char *plc4c_return_code_to_message(return_code err) {
     return "hurz";
 }
 
-void plc4c_types_promise_set_success_callback(plc4c_promise* promise, plc4c_success_callback successCallback) {
+void plc4c_promise_set_success_callback(plc4c_promise* promise, plc4c_success_callback successCallback) {
     promise->successCallback = successCallback;
 }
 
-void plc4c_types_promise_set_failure_callback(plc4c_promise* promise, plc4c_failure_callback failureCallback) {
+void plc4c_promise_set_failure_callback(plc4c_promise* promise, plc4c_failure_callback failureCallback) {
     promise->failureCallback = failureCallback;
 }
 
-bool plc4c_types_promise_completed(plc4c_promise* promise) {
+bool plc4c_promise_completed(plc4c_promise* promise) {
     return promise->returnCode != UNFINISHED;
 }
 
-bool plc4c_types_promise_completed_successfully(plc4c_promise* promise) {
+bool plc4c_promise_completed_successfully(plc4c_promise* promise) {
     return promise->returnCode == OK;
 }
 
-bool plc4c_types_promise_completed_unsuccessfully(plc4c_promise* promise) {
-    return plc4c_types_promise_completed(promise) && !plc4c_types_promise_completed_successfully(promise);
+bool plc4c_promise_completed_unsuccessfully(plc4c_promise* promise) {
+    return plc4c_promise_completed(promise) && !plc4c_promise_completed_successfully(promise);
 }