Browse Source

refactor(server): Simplify method signatures for AsyncMethodManager

Julius Pfrommer 5 years ago
parent
commit
e4da8b12fa
2 changed files with 5 additions and 7 deletions
  1. 3 5
      src/server/ua_asyncmethod_manager.c
  2. 2 2
      src/server/ua_asyncmethod_manager.h

+ 3 - 5
src/server/ua_asyncmethod_manager.c

@@ -17,11 +17,10 @@
 
 #if UA_MULTITHREADING >= 100
 
-UA_StatusCode
+void
 UA_AsyncMethodManager_init(UA_AsyncMethodManager *amm) {
+    memset(amm, 0, sizeof(UA_AsyncMethodManager));
     LIST_INIT(&amm->asyncmethods);
-    amm->currentCount = 0;
-    return UA_STATUSCODE_GOOD;
 }
 
 void
@@ -96,7 +95,7 @@ UA_AsyncMethodManager_createEntry(UA_AsyncMethodManager *amm, UA_Server *server,
 }
 
 /* Remove entry and free all allocated data */
-UA_StatusCode
+void
 UA_AsyncMethodManager_removeEntry(UA_AsyncMethodManager *amm,
                                   asyncmethod_list_entry *current) {
     UA_assert(current);
@@ -105,7 +104,6 @@ UA_AsyncMethodManager_removeEntry(UA_AsyncMethodManager *amm,
     UA_CallResponse_deleteMembers(&current->response);
     UA_NodeId_clear(&current->sessionId);
     UA_free(current);
-    return UA_STATUSCODE_GOOD;
 }
 
 /* Check if CallRequest is waiting way too long (120s) */

+ 2 - 2
src/server/ua_asyncmethod_manager.h

@@ -41,7 +41,7 @@ typedef struct UA_AsyncMethodManager {
     UA_UInt32 currentCount;
 } UA_AsyncMethodManager;
 
-UA_StatusCode
+void
 UA_AsyncMethodManager_init(UA_AsyncMethodManager *amm);
 
 /* Deletes all entries */
@@ -54,7 +54,7 @@ UA_AsyncMethodManager_createEntry(UA_AsyncMethodManager *amm, UA_Server *server,
                                   const UA_DataType *responseType, const UA_UInt32 nCountdown);
 
 /* The pointers amm and current must not be NULL */
-UA_StatusCode
+void
 UA_AsyncMethodManager_removeEntry(UA_AsyncMethodManager *amm, asyncmethod_list_entry *current);
 
 asyncmethod_list_entry*