Merge pull request #58 from shikokuchuo/restore

Restore
shikokuchuo · Nov 13, 2024 · 69185fc · 69185fc
2 parents a1deb15 + d6705b5
commit 69185fc
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: nanonext
 Type: Package
 Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
-Version: 1.3.0.9004
+Version: 1.3.0.9009
 Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
     a socket library implementing 'Scalability Protocols', a reliable,
     high-performance standard for common communications patterns including

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# nanonext 1.3.0.9004 (development)
+# nanonext 1.3.0.9009 (development)
 
 #### Updates
 

diff --git a/src/aio.c b/src/aio.c
@@ -127,9 +127,6 @@ static void iaio_finalizer(SEXP xptr) {
   nng_aio_free(xp->aio);
   if (xp->data != NULL)
     R_Free(xp->data);
-  // release linked list node if cb has already run
-  if (xp->cb != NULL && TAG((SEXP) xp->cb) == R_NilValue)
-    nano_ReleaseObject((SEXP) xp->cb);
   R_Free(xp);
 
 }

diff --git a/src/thread.c b/src/thread.c
@@ -246,9 +246,8 @@ static void thread_disp_finalizer(SEXP xptr) {
   ncv->condition = -1;
   nng_cv_wake(cv);
   nng_mtx_unlock(mtx);
-  if (xp->tls != NULL) {
+  if (xp->tls != NULL)
     nng_tls_config_free(xp->tls);
-  }
   nng_thread_destroy(xp->thr);
   nng_url_free(xp->up);
   for (int i = 0; i < xp->n; i++) {