diff options
| author |   Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
|---|---|---|
| committer | Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
| commit | 229385955109b866a23c4ac2aa03d4d11044c39d (patch) | |
| tree | 0591f9c2fc4144d62330337cc2b94c63dfeded54 /hicn-plugin/vapi | |
| parent | 6ffbb5ed61733b8dbef39b1a9d437e899e9359d7 (diff) | |
[HICN-708] Rebase with master
Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159
Diffstat (limited to 'hicn-plugin/vapi')
| -rw-r--r-- | hicn-plugin/vapi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hicn-plugin/vapi/vapi_safe.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/hicn-plugin/vapi/CMakeLists.txt b/hicn-plugin/vapi/CMakeLists.txt index 03fd489ca..9464cd944 100644 --- a/hicn-plugin/vapi/CMakeLists.txt +++ b/hicn-plugin/vapi/CMakeLists.txt @@ -42,7 +42,7 @@ build_library(${SAFE_VAPI} LINK_LIBRARIES ${LIBRARIES} COMPONENT ${HICN_PLUGIN} INCLUDE_DIRS ${INCLUDE_DIRS} - INSTALL_ROOT_DIR / + HEADER_ROOT_DIR / DEFINITIONS ${COMPILER_DEFINITIONS} ) diff --git a/hicn-plugin/vapi/vapi_safe.c b/hicn-plugin/vapi/vapi_safe.c index c1d66c0ac..e9353497f 100644 --- a/hicn-plugin/vapi/vapi_safe.c +++ b/hicn-plugin/vapi/vapi_safe.c @@ -12,7 +12,7 @@ u32 count = 0; int lock = 0; vapi_error_e vapi_connect_safe(vapi_ctx_t *vapi_ctx_ret, int async) { - vapi_error_e rv = VAPI_OK; + vapi_error_e rv = VAPI_OK; while (!__sync_bool_compare_and_swap(&lock, 0, 1)); @@ -39,7 +39,7 @@ vapi_error_e vapi_connect_safe(vapi_ctx_t *vapi_ctx_ret, int async) { async ? VAPI_MODE_NONBLOCKING : VAPI_MODE_BLOCKING, true); if (rv != VAPI_OK) - goto err_vapi; + goto err; count++; } @@ -49,8 +49,6 @@ vapi_error_e vapi_connect_safe(vapi_ctx_t *vapi_ctx_ret, int async) { while (!__sync_bool_compare_and_swap(&lock, 1, 0)); return rv; - err_vapi: - vapi_ctx_free(g_vapi_ctx_instance); err_mutex_init: free(mutex); err_mutex_alloc: |