Merge pull request #233 from zerotier/brenton/fix-unused-warnings

fix unused warnings
zerotier · Jul 20, 2023 · 1230544 · 1230544
2 parents 279fc18 + 6ce18af
commit 1230544
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/Events.cpp b/src/Events.cpp
@@ -182,11 +182,10 @@ void Events::sendToUser(zts_event_msg_t* msg)
     if (javaCbMethodId) {
         JNIEnv* env;
 #if defined(__ANDROID__)
-        jint rs = jvm->AttachCurrentThread(&env, NULL);
+        jvm->AttachCurrentThread(&env, NULL);
 #else
-        jint rs = jvm->AttachCurrentThread((void**)&env, NULL);
+        jvm->AttachCurrentThread((void**)&env, NULL);
 #endif
-        uint64_t arg = 0;
         uint64_t id = 0;
         if (ZTS_NODE_EVENT(msg->event_code)) {
             id = msg->node ? msg->node->node_id : 0;

diff --git a/src/NodeService.cpp b/src/NodeService.cpp
@@ -1061,25 +1061,24 @@ int NodeService::getRouteAtIdx(
         return ZTS_ERR_ARG;
     }
     // target
-    const char* err = NULL;
     struct sockaddr* sa = (struct sockaddr*)&(netState.config.routes[idx].target);
     if (sa->sa_family == AF_INET) {
         struct sockaddr_in* in4 = (struct sockaddr_in*)sa;
-        err = inet_ntop(AF_INET, &(in4->sin_addr), target, ZTS_INET6_ADDRSTRLEN);
+        inet_ntop(AF_INET, &(in4->sin_addr), target, ZTS_INET6_ADDRSTRLEN);
     }
     if (sa->sa_family == AF_INET6) {
         struct sockaddr_in6* in6 = (struct sockaddr_in6*)sa;
-        err = inet_ntop(AF_INET6, &(in6->sin6_addr), target, ZTS_INET6_ADDRSTRLEN);
+        inet_ntop(AF_INET6, &(in6->sin6_addr), target, ZTS_INET6_ADDRSTRLEN);
     }
     // via
     struct sockaddr* sa_via = (struct sockaddr*)&(netState.config.routes[idx].via);
     if (sa_via->sa_family == AF_INET) {
         struct sockaddr_in* in4 = (struct sockaddr_in*)sa_via;
-        err = inet_ntop(AF_INET, &(in4->sin_addr), via, ZTS_INET6_ADDRSTRLEN);
+        inet_ntop(AF_INET, &(in4->sin_addr), via, ZTS_INET6_ADDRSTRLEN);
     }
     if (sa_via->sa_family == AF_INET6) {
         struct sockaddr_in6* in6 = (struct sockaddr_in6*)sa_via;
-        err = inet_ntop(AF_INET6, &(in6->sin6_addr), via, ZTS_INET6_ADDRSTRLEN);
+        inet_ntop(AF_INET6, &(in6->sin6_addr), via, ZTS_INET6_ADDRSTRLEN);
     }
     if (strlen(via) == 0) {
         strncpy(via, "0.0.0.0", 7);

diff --git a/src/bindings/java/JavaSockets.cxx b/src/bindings/java/JavaSockets.cxx
@@ -37,7 +37,7 @@ extern JavaVM* jvm;
 
 void java_detach_from_thread()
 {
-    jint rs = jvm->DetachCurrentThread();
+    jvm->DetachCurrentThread();
 }
 
 #ifdef __cplusplus