[Openvpn-devel,v1] ssl_util: Fix conversion warning in get_num_elements

Message ID 20251017204914.7548-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v1] ssl_util: Fix conversion warning in get_num_elements | expand

Commit Message

Gert Doering Oct. 17, 2025, 8:49 p.m. UTC
From: Frank Lichtenheld <frank@lichtenheld.com>

Just use correct type.

Change-Id: I2d1fbe7ec080beb931253d09c1b5227e9bf4e756
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1281
---

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/+/1281
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):

Comments

Gert Doering Oct. 18, 2025, 4:51 p.m. UTC | #1
"Just using the correct type" sounds like a great plan :-) - code change
looks good, BB confirms.

Your patch has been applied to the master branch.

commit f93a0f3fd67bb12ba5efe05652f822585e018a84
Author: Frank Lichtenheld
Date:   Fri Oct 17 22:49:09 2025 +0200

     ssl_util: Fix conversion warning in get_num_elements

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1281
     Message-Id: <20251017204914.7548-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg33421.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/ssl_util.c b/src/openvpn/ssl_util.c
index 50e8c03..fb7cf3e 100644
--- a/src/openvpn/ssl_util.c
+++ b/src/openvpn/ssl_util.c
@@ -290,21 +290,16 @@ 
     return NULL;
 }
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
 int
 get_num_elements(const char *string, char delimiter)
 {
-    int string_len = strlen(string);
+    const size_t string_len = strlen(string);
 
     ASSERT(0 != string_len);
 
     int element_count = 1;
     /* Get number of ciphers */
-    for (int i = 0; i < string_len; i++)
+    for (size_t i = 0; i < string_len; i++)
     {
         if (string[i] == delimiter)
         {
@@ -314,7 +309,3 @@ 
 
     return element_count;
 }
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif