diff mbox series

[Openvpn-devel,v2] Remove unused local variables

Message ID 20261103123306.3866-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v2] Remove unused local variables |

Commit Message

Gert Doering Nov. 3, 2026, 12:32 p.m. UTC 
  From: Razvan Cojocaru <razvanc@mailbox.org>

- tls_session_generate_dynamic_tls_crypt_key(): kds
- socks_proxy_recv_char(): reads fd_set
- verify_cert_call_command(): gc
- man_dispatch_command(): gc, the unused nparms parameter and the
  done label, which only served gc_free()

Change-Id: Ie6c1fa663978eedca2391f1250129bc46738faa0
Signed-off-by: Razvan Cojocaru <razvanc@mailbox.org>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2098
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2098
This mail reflects revision 2 of this Change.

Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <frank@lichtenheld.com>
diff mbox series

Patch

diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 16864c8..102f96e 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -1478,16 +1478,12 @@ 
 }
 
 static void
-man_dispatch_command(struct management *man, struct status_output *so, const char **p,
-                     const int nparms)
+man_dispatch_command(struct management *man, struct status_output *so, const char **p)
 {
-    struct gc_arena gc = gc_new();
-
     ASSERT(p[0]);
     if (streq(p[0], "exit") || streq(p[0], "quit"))
     {
         man->connection.halt = true;
-        goto done;
     }
     else if (streq(p[0], "help"))
     {
@@ -1841,9 +1837,6 @@ 
     {
         msg(M_CLIENT, "ERROR: unknown command [%s], enter 'help' for more options", p[0]);
     }
-
-done:
-    gc_free(&gc);
 }
 
 #ifdef _WIN32
@@ -2250,7 +2243,7 @@ 
 
         if (nparms > 0)
         {
-            man_dispatch_command(man, so, (const char **)parms, nparms);
+            man_dispatch_command(man, so, (const char **)parms);
         }
     }
 
diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c
index cab9af6..a8c9fd3 100644
--- a/src/openvpn/socks.c
+++ b/src/openvpn/socks.c
@@ -86,10 +86,6 @@ 
                       const struct event_timeout *server_poll_timeout,
                       volatile int *signal_received)
 {
-    fd_set reads;
-    FD_ZERO(&reads);
-    openvpn_fd_set(sd, &reads);
-
     struct timeval tv;
     tv.tv_sec = get_server_poll_remaining_time(server_poll_timeout);
     tv.tv_usec = 0;
diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c
index 73e3696..167e659 100644
--- a/src/openvpn/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
@@ -515,7 +515,6 @@ 
                          char *subject)
 {
     int ret;
-    struct gc_arena gc = gc_new();
     struct argv argv = argv_new();
 
     setenv_str(es, "script_type", "tls-verify");
@@ -526,7 +525,6 @@ 
     argv_msg_prefix(D_TLS_DEBUG, &argv, "TLS: executing verify command");
     ret = openvpn_run_script(&argv, es, 0, "--tls-verify script");
 
-    gc_free(&gc);
     argv_free(&argv);
 
     if (ret)
diff --git a/src/openvpn/tls_crypt.c b/src/openvpn/tls_crypt.c
index 23c7975..447262c 100644
--- a/src/openvpn/tls_crypt.c
+++ b/src/openvpn/tls_crypt.c
@@ -121,9 +121,6 @@ 
 
     const int key_direction = session->opt->server ? KEY_DIRECTION_NORMAL : KEY_DIRECTION_INVERSE;
 
-    struct key_direction_state kds;
-    key_direction_state_init(&kds, key_direction);
-
     struct key_type kt = tls_crypt_kt();
 
     init_key_ctx_bi(&session->tls_wrap_reneg.opt.key_ctx_bi, &rengokeys, key_direction, &kt,