From: "cron2 (Code Review)" Date: Fri, 25 Jul 2025 15:40:05 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="JwhZSkLWV04="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: plugins: Clean up -Wconversion warnings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld , plaisthos Cc: openvpn-devel --JwhZSkLWV04= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#2) to the change originally created by= flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1111?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: plugins: Clean up -Wconversion warnings ...................................................................... plugins: Clean up -Wconversion warnings Most of the are actually the same ones copied to every single plugin. Some drive-by fixes of other warnings and some conversion cleanups that had no warnings because they were suppressed by casts. Change-Id: Id61df43bd79fc794a55e107daa0218c8441c2b2c Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20250725124415.20645-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 330.html Signed-off-by: Gert Doering --- M sample/sample-plugins/client-connect/sample-client-connect.c M sample/sample-plugins/defer/multi-auth.c M sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporte= r.c M sample/sample-plugins/log/log.c M sample/sample-plugins/log/log_v3.c M sample/sample-plugins/simple/base64.c M sample/sample-plugins/simple/simple.c M src/plugins/auth-pam/auth-pam.c M src/plugins/auth-pam/utils.c M src/plugins/down-root/down-root.c 10 files changed, 42 insertions(+), 54 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/11/1111/2 diff --git a/sample/sample-plugins/client-connect/sample-client-connect.c b= /sample/sample-plugins/client-connect/sample-client-connect.c index 18c2c6f..5194270 100644 --- a/sample/sample-plugins/client-connect/sample-client-connect.c +++ b/sample/sample-plugins/client-connect/sample-client-connect.c @@ -86,9 +86,8 @@ { if (envp) { - int i; - const int namelen =3D strlen(name); - for (i =3D 0; envp[i]; ++i) + const size_t namelen =3D strlen(name); + for (int i =3D 0; envp[i]; ++i) { if (!strncmp(envp[i], name, namelen)) { @@ -309,7 +308,7 @@ /* do mighty complicated work that will really take time here... */ plugin_log(PLOG_NOTE, MODULE, "in async/deferred handler, sleep(%d)", = seconds); - sleep(seconds); + sleep((unsigned int)seconds); /* write config options to openvpn */ int ret =3D write_cc_options_file(name, envp); diff --git a/sample/sample-plugins/defer/multi-auth.c b/sample/sample-plugi= ns/defer/multi-auth.c index 38db07f..c458346 100644 --- a/sample/sample-plugins/defer/multi-auth.c +++ b/sample/sample-plugins/defer/multi-auth.c @@ -124,9 +124,8 @@ { if (envp) { - int i; - const int namelen =3D strlen(name); - for (i =3D 0; envp[i]; ++i) + const size_t namelen =3D strlen(name); + for (int i =3D 0; envp[i]; ++i) { if (!strncmp(envp[i], name, namelen)) { @@ -170,7 +169,7 @@ /* Require a minimum OpenVPN Plugin API */ OPENVPN_EXPORT int -openvpn_plugin_min_version_required_v1() +openvpn_plugin_min_version_required_v1(void) { return OPENVPN_PLUGIN_VERSION_MIN; } @@ -349,9 +348,9 @@ */ /* do mighty complicated work that will really take time here... */ - plog(context, PLOG_NOTE, "in async/deferred handler, usleep(%d)", - context->test_deferred_auth*1000); - usleep(context->test_deferred_auth*1000); + useconds_t wait_time =3D (useconds_t)context->test_deferred_auth*1000; + plog(context, PLOG_NOTE, "in async/deferred handler, usleep(%u)", wait= _time); + usleep(wait_time); /* now signal success state to openvpn */ int fd =3D open(auth_control_file, O_WRONLY); diff --git a/sample/sample-plugins/keying-material-exporter-demo/keyingmate= rialexporter.c b/sample/sample-plugins/keying-material-exporter-demo/keying= materialexporter.c index cc256dd..f1f8868 100644 --- a/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexp= orter.c +++ b/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexp= orter.c @@ -69,9 +69,8 @@ { if (envp) { - int i; - const int namelen =3D strlen(name); - for (i =3D 0; envp[i]; ++i) + const size_t namelen =3D strlen(name); + for (int i =3D 0; envp[i]; ++i) { if (!strncmp(envp[i], name, namelen)) { diff --git a/sample/sample-plugins/log/log.c b/sample/sample-plugins/log/lo= g.c index 82595cf..b304f16 100644 --- a/sample/sample-plugins/log/log.c +++ b/sample/sample-plugins/log/log.c @@ -52,9 +52,8 @@ { if (envp) { - int i; - const int namelen =3D strlen(name); - for (i =3D 0; envp[i]; ++i) + const size_t namelen =3D strlen(name); + for (int i =3D 0; envp[i]; ++i) { if (!strncmp(envp[i], name, namelen)) { diff --git a/sample/sample-plugins/log/log_v3.c b/sample/sample-plugins/log= /log_v3.c index c90cc3d..a024027 100644 --- a/sample/sample-plugins/log/log_v3.c +++ b/sample/sample-plugins/log/log_v3.c @@ -55,9 +55,8 @@ { if (envp) { - int i; - const int namelen =3D strlen(name); - for (i =3D 0; envp[i]; ++i) + const size_t namelen =3D strlen(name); + for (int i =3D 0; envp[i]; ++i) { if (!strncmp(envp[i], name, namelen)) { diff --git a/sample/sample-plugins/simple/base64.c b/sample/sample-plugins/= simple/base64.c index 6855966..e1cc791 100644 --- a/sample/sample-plugins/simple/base64.c +++ b/sample/sample-plugins/simple/base64.c @@ -59,9 +59,8 @@ { if (envp) { - int i; - const int namelen =3D strlen(name); - for (i =3D 0; envp[i]; ++i) + const size_t namelen =3D strlen(name); + for (int i =3D 0; envp[i]; ++i) { if (!strncmp(envp[i], name, namelen)) { @@ -175,7 +174,7 @@ /* test the BASE64 encode function */ char *buf =3D NULL; - int r =3D ovpn_base64_encode(clcert_cn, strlen(clcert_cn), &buf); + int r =3D ovpn_base64_encode(clcert_cn, (int)strlen(clcert_cn), &buf); ovpn_log(PLOG_NOTE, PLUGIN_NAME, "BASE64 encoded '%s' (return value %i= ): '%s'", clcert_cn, r, buf); diff --git a/sample/sample-plugins/simple/simple.c b/sample/sample-plugins/= simple/simple.c index e17f3fa..2c096e2 100644 --- a/sample/sample-plugins/simple/simple.c +++ b/sample/sample-plugins/simple/simple.c @@ -54,9 +54,8 @@ { if (envp) { - int i; - const int namelen =3D strlen(name); - for (i =3D 0; envp[i]; ++i) + const size_t namelen =3D strlen(name); + for (int i =3D 0; envp[i]; ++i) { if (!strncmp(envp[i], name, namelen)) { diff --git a/src/plugins/auth-pam/auth-pam.c b/src/plugins/auth-pam/auth-pa= m.c index 8692806..7264f95 100644 --- a/src/plugins/auth-pam/auth-pam.c +++ b/src/plugins/auth-pam/auth-pam.c @@ -165,31 +165,30 @@ } } -static int -recv_string(int fd, char *buffer, int len) +static ssize_t +recv_string(int fd, char *buffer, size_t len) { if (len > 0) { - ssize_t size; memset(buffer, 0, len); - size =3D read(fd, buffer, len); + ssize_t size =3D read(fd, buffer, len); buffer[len-1] =3D 0; if (size >=3D 1) { - return (int)size; + return size; } } return -1; } -static int +static ssize_t send_string(int fd, const char *string) { - const int len =3D strlen(string) + 1; + const size_t len =3D strlen(string) + 1; const ssize_t size =3D write(fd, string, len); if (size =3D=3D len) { - return (int) size; + return size; } else { @@ -645,27 +644,26 @@ * PAM conversation function */ static int -my_conv(int n, const struct pam_message **msg_array, +my_conv(int num_msg, const struct pam_message **msg_array, struct pam_response **response_array, void *appdata_ptr) { const struct user_pass *up =3D ( const struct user_pass *) appdata_ptr; struct pam_response *aresp; - int i; int ret =3D PAM_SUCCESS; *response_array =3D NULL; - if (n <=3D 0 || n > PAM_MAX_NUM_MSG) + if (num_msg <=3D 0 || num_msg > PAM_MAX_NUM_MSG) { return (PAM_CONV_ERR); } - if ((aresp =3D calloc(n, sizeof *aresp)) =3D=3D NULL) + if ((aresp =3D calloc((size_t)num_msg, sizeof *aresp)) =3D=3D NULL) { return (PAM_BUF_ERR); } /* loop through each PAM-module query */ - for (i =3D 0; i < n; ++i) + for (int i =3D 0; i < num_msg; ++i) { const struct pam_message *msg =3D msg_array[i]; aresp[i].resp_retcode =3D 0; @@ -683,9 +681,9 @@ { /* use name/value list match method */ const struct name_value_list *list =3D up->name_value_list; - int j; /* loop through name/value pairs */ + int j; /* checked after loop */ for (j =3D 0; j < list->len; ++j) { const char *match_name =3D list->data[j].name; diff --git a/src/plugins/auth-pam/utils.c b/src/plugins/auth-pam/utils.c index a6ccfbf..ab5e17e 100644 --- a/src/plugins/auth-pam/utils.c +++ b/src/plugins/auth-pam/utils.c @@ -79,7 +79,7 @@ while (scratch) { - strncat(temp, searching, scratch-searching); + strncat(temp, searching, (size_t)(scratch-searching)); strcat(temp, replacewith); searching =3D scratch+strlen(searchfor); @@ -93,9 +93,8 @@ { if (envp) { - int i; - const int namelen =3D strlen(name); - for (i =3D 0; envp[i]; ++i) + const size_t namelen =3D strlen(name); + for (int i =3D 0; envp[i]; ++i) { if (!strncmp(envp[i], name, namelen)) { diff --git a/src/plugins/down-root/down-root.c b/src/plugins/down-root/down= -root.c index 253adcd..2c0faf4 100644 --- a/src/plugins/down-root/down-root.c +++ b/src/plugins/down-root/down-root.c @@ -88,9 +88,8 @@ { if (envp) { - int i; - const int namelen =3D strlen(name); - for (i =3D 0; envp[i]; ++i) + const size_t namelen =3D strlen(name); + for (int i =3D 0; envp[i]; ++i) { if (!strncmp(envp[i], name, namelen)) { @@ -108,10 +107,10 @@ /* * Return the length of a string array */ -static int +static size_t string_array_len(const char *array[]) { - int i =3D 0; + size_t i =3D 0; if (array) { while (array[i]) @@ -141,14 +140,14 @@ } } -static int +static ssize_t send_control(int fd, int code) { unsigned char c =3D (unsigned char) code; const ssize_t size =3D write(fd, &c, sizeof(c)); if (size =3D=3D sizeof(c)) { - return (int) size; + return size; } else { @@ -281,7 +280,6 @@ openvpn_plugin_open_v1(unsigned int *type_mask, const char *argv[], const = char *envp[]) { struct down_root_context *context; - int i =3D 0; /* * Allocate our context @@ -320,7 +318,7 @@ } /* Ignore argv[0], as it contains just the plug-in file name */ - for (i =3D 1; i < string_array_len(argv); i++) + for (int i =3D 1; i < string_array_len(argv); i++) { context->command[i-1] =3D (char *) argv[i]; } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1111?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Id61df43bd79fc794a55e107daa0218c8441c2b2c Gerrit-Change-Number: 1111 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --JwhZSkLWV04= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #2 to the change originally cr= eated by flichtenheld.

View Change

The following approvals got outd= ated and were removed: Code-Review+2 by cron2

plugins: Clean up -Wconversion warnings

Most = of the are actually the same ones copied to every
single plugin.

= Some drive-by fixes of other warnings and some
conversion cleanups that = had no warnings because
they were suppressed by casts.

Change-Id:= Id61df43bd79fc794a55e107daa0218c8441c2b2c
Signed-off-by: Frank Lichtenh= eld <frank@...2641...>
Acked-by: Gert Doering <gert@...1296...&= gt;
Message-Id: <20250725124415.20645-1-gert@...1296...>
URL: h= ttps://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32330.ht= ml
Signed-off-by: Gert Doering <gert@...1296...>
---
M sampl= e/sample-plugins/client-connect/sample-client-connect.c
M sample/sample-= plugins/defer/multi-auth.c
M sample/sample-plugins/keying-material-expor= ter-demo/keyingmaterialexporter.c
M sample/sample-plugins/log/log.c
M= sample/sample-plugins/log/log_v3.c
M sample/sample-plugins/simple/base6= 4.c
M sample/sample-plugins/simple/simple.c
M src/plugins/auth-pam/au= th-pam.c
M src/plugins/auth-pam/utils.c
M src/plugins/down-root/down-= root.c
10 files changed, 42 insertions(+), 54 deletions(-)

=
git=
 pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/11/1111/2
diff --git a/sample/sample-plugins/client-connect/sample-client-connect.c = b/sample/sample-plugins/client-connect/sample-client-connect.c
index 18c2c6f..5194270 100644
--- a/sample/sample-plugi= ns/client-connect/sample-client-connect.c
+++ b/sample/samp= le-plugins/client-connect/sample-client-connect.c
@@ -86,9 = +86,8 @@
{
if (envp)
= {
- int i;<= /span>
- const int name= len =3D strlen(name);
-= for (i =3D 0; envp[i]; ++i)
+ const size_t namelen =3D strlen(name);
+ for (int i =3D 0; envp[i= ]; ++i)

{
if (!strncm= p(envp[i], name, namelen))
{
@= @ -309,7 +308,7 @@

/* do mighty comp= licated work that will really take time here... */
plu= gin_log(PLOG_NOTE, MODULE, "in async/deferred handler, sleep(%d)"= , seconds);
- sleep(= seconds);
+ sleep(= (unsigned int)seconds);

/* write con= fig options to openvpn */
int ret =3D write_cc_options= _file(name, envp);
diff --git a/sample/sample-plugins/defer= /multi-auth.c b/sample/sample-plugins/defer/multi-auth.c
in= dex 38db07f..c458346 100644
--- a/sample/sample-plugins/def= er/multi-auth.c
+++ b/sample/sample-plugins/defer/multi-aut= h.c
@@ -124,9 +124,8 @@
{
= if (envp)
{
- int i;
- const int namelen =3D strlen(name);
- for (i =3D 0; envp[i]; ++i)<= br>+ const size_t namele= n =3D strlen(name);
+= for (int i =3D 0; envp[i]; ++i)
{ if (!strncmp(envp[i], name, namelen))
= {
@@ -170,7 +169,7 @@
=
/* Require a minimum OpenVPN Plugin API */
OPEN= VPN_EXPORT int
-openvpn= _plugin_min_version_required_v1()
+openvpn_plugin_min_version_required_v1(void)
= {
return OPENVPN_PLUGIN_VERSION_MIN;
= }
@@ -349,9 +348,9 @@
*/
<= span>
/* do mighty complicated work that will really = take time here... */
- = plog(context, PLOG_NOTE, "in async/deferred handler, usleep(%d)&quo= t;,
- context-&= gt;test_deferred_auth*1000);
- usleep(context->test_deferred_auth*1000);
+ useconds_t wait_time =3D (useconds_= t)context->test_deferred_auth*1000;
+ plog(context, PLOG_NOTE, "in async/deferred han= dler, usleep(%u)", wait_time);
+ usleep(wait_time);

= /* now signal success state to openvpn */
int fd = =3D open(auth_control_file, O_WRONLY);
diff --git a/sample/= sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c b/sam= ple/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c
index cc256dd..f1f8868 100644
--- a/sample/s= ample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c=
+++ b/sample/sample-plugins/keying-material-exporter-demo/keyingm= aterialexporter.c
@@ -69,9 +69,8 @@
{
if (envp)
{
- int i;
- const int namelen =3D strlen(name);
= - for (i =3D 0; envp[i]; += +i)
+ const si= ze_t namelen =3D strlen(name);
+ for (int i =3D 0; envp[i]; ++i)
= {
if (!strncmp(envp[i], name, namelen))

{
diff --git a/sample/sample-plugin= s/log/log.c b/sample/sample-plugins/log/log.c
index 82595cf= ..b304f16 100644
--- a/sample/sample-plugins/log/log.c
+++ b/sample/sample-plugins/log/log.c
@@ -52,9 = +52,8 @@
{
if (envp)
= {
- int i;<= /span>
- const int name= len =3D strlen(name);
-= for (i =3D 0; envp[i]; ++i)
+ const size_t namelen =3D strlen(name);
+ for (int i =3D 0; envp[i= ]; ++i)

{
if (!strncm= p(envp[i], name, namelen))
{
d= iff --git a/sample/sample-plugins/log/log_v3.c b/sample/sample-plugins/log/= log_v3.c
index c90cc3d..a024027 100644
--- = a/sample/sample-plugins/log/log_v3.c
+++ b/sample/sample-pl= ugins/log/log_v3.c
@@ -55,9 +55,8 @@
{
if (envp)
{
- int i;
- const int namelen =3D strlen(name);- for (i =3D 0; envp[i]; = ++i)
+ const s= ize_t namelen =3D strlen(name);
+ for (int i =3D 0; envp[i]; ++i)
= {
if (!strncmp(envp[i], name, namelen))
{
diff --git a/sample/sample-plugi= ns/simple/base64.c b/sample/sample-plugins/simple/base64.c
= index 6855966..e1cc791 100644
--- a/sample/sample-plugins/s= imple/base64.c
+++ b/sample/sample-plugins/simple/base64.c<= /span>
@@ -59,9 +59,8 @@
{
i= f (envp)
{
- int i;
- for (i =3D 0; envp[i]; ++i)
+ const size_t namelen =3D s= trlen(name);

+ = for (int i =3D 0; envp[i]; ++i)
{
if (!strncmp(envp[i], name, namelen))

= {
@@ -175,7 +174,7 @@

/* test the BASE64 encode function */

char *bu= f =3D NULL;
- int r = =3D ovpn_base64_encode(clcert_cn, strlen(clcert_cn), &buf);
<= span style=3D"color: hsl(120, 100%, 40%);">+ int r =3D ovpn_base64_encod= e(clcert_cn, (int)strlen(clcert_cn), &buf);

ovpn_l= og(PLOG_NOTE, PLUGIN_NAME, "BASE64 encoded '%s' (return value = %i): '%s'",
clcert_cn, r, buf);=

diff --git a/sample/sample-plugins/simpl= e/simple.c b/sample/sample-plugins/simple/simple.c
index e1= 7f3fa..2c096e2 100644
--- a/sample/sample-plugins/simple/si= mple.c
+++ b/sample/sample-plugins/simple/simple.c@@ -54,9 +54,8 @@
{
if (envp)=
{
- int i;
- = const int namelen =3D strlen(name);
- for (i =3D 0; envp[i]; ++i)
+ const size_t namelen =3D strlen(n= ame);
+ for (i= nt i =3D 0; envp[i]; ++i)
{
= if (!strncmp(envp[i], name, namelen))
{=
diff --git a/src/plugins/auth-pam/auth-pam.c b/src/plugins= /auth-pam/auth-pam.c
index 8692806..7264f95 100644--- a/src/plugins/auth-pam/auth-pam.c
+++ b/src/plu= gins/auth-pam/auth-pam.c
@@ -165,31 +165,30 @@
}
}

-static int
-recv_string(int fd, char *buffer, int len)
+static ssize_t
+recv_string(int fd, char *buffer, size_t = len)
{
if (len > 0)
{
- ssize= _t size;
memset(buffer, 0, len);
- size =3D read(fd, buffer, len);=
+ ssize_t siz= e =3D read(fd, buffer, len);
buffer[len-1] =3D 0;<= /span>
if (size >=3D 1)
{
- return (int)s= ize;
+ ret= urn size;
}
}
return -1;

}

-static int
+static ssize_t
send_string(int fd, = const char *string)
{
- const int len =3D strlen(string) + 1;
+ const size_t len =3D strlen(stri= ng) + 1;
const ssize_t size =3D write(fd, string, len)= ;
if (size =3D=3D len)
{- return (int) size;
+ return size;

}
else
{
@@ -645,27 +644,26 @@
* PAM conversation funct= ion
*/
static int
-my_conv(int n, const struct pam_message **m= sg_array,
+my_conv(in= t num_msg, const struct pam_message **msg_array,
s= truct pam_response **response_array, void *appdata_ptr)
{<= /span>
const struct user_pass *up =3D ( const struct user_pas= s *) appdata_ptr;
struct pam_response *aresp;- int i;
= int ret =3D PAM_SUCCESS;

*response= _array =3D NULL;

- if (n <=3D 0 || n > PAM_MAX_NUM_MSG)
+ if (num_msg <=3D 0 || num_ms= g > PAM_MAX_NUM_MSG)

{
ret= urn (PAM_CONV_ERR);
}
- if ((aresp =3D calloc(n, sizeof *aresp)) =3D=3D NU= LL)
+ if ((aresp = =3D calloc((size_t)num_msg, sizeof *aresp)) =3D=3D NULL)
= {
return (PAM_BUF_ERR);
}<= /span>

/* loop through each PAM-module quer= y */
- for (i =3D 0;= i < n; ++i)
+ = for (int i =3D 0; i < num_msg; ++i)
{
const struct pam_message *msg =3D msg_array[i];

aresp[i].resp_retcode =3D 0;

@@ -683,9 +681,9 @@<= /span>
{
/* use name/value l= ist match method */
const struct name_value_li= st *list =3D up->name_value_list;
- int j;

= /* loop through name/value pairs */
+ int j; /* checked after loop */ for (j =3D 0; j < list->len; ++j)
{

const char *match_name =3D= list->data[j].name;
diff --git a/src/plugins/auth-pam/u= tils.c b/src/plugins/auth-pam/utils.c
index a6ccfbf..ab5e17= e 100644
--- a/src/plugins/auth-pam/utils.c
+++ b/src/plugins/auth-pam/utils.c
@@ -79,7 +79,7 @@


while (scratch)
{
- strncat(temp, se= arching, scratch-searching);
+ strncat(temp, searching, (size_t)(scratch-searching));
strcat(temp, replacewith);
searching =3D scratch+strlen(searchfor);
@= @ -93,9 +93,8 @@
{
if (envp) {
- = int i;
- const = int namelen =3D strlen(name);
- for (i =3D 0; envp[i]; ++i)
+ const size_t namelen =3D strlen(name);
+ for (int i =3D 0= ; envp[i]; ++i)
{
if = (!strncmp(envp[i], name, namelen))
{diff --git a/src/plugins/down-root/down-root.c b/src/plugins/down-ro= ot/down-root.c
index 253adcd..2c0faf4 100644
--- a/src/plugins/down-root/down-root.c

+++ b/src/plugins= /down-root/down-root.c
@@ -88,9 +88,8 @@
{=
if (envp)
{
- int i;
- const int namelen =3D strlen(name);
- for (i =3D 0; envp[= i]; ++i)
+ con= st size_t namelen =3D strlen(name);
+ for (int i =3D 0; envp[i]; ++i)
= {
if (!strncmp(envp[i], name, namelen))<= /span>
{
@@ -108,10 +107,10 @@=
/*
* Return the length of a string array
*/
-static= int
+static size_t
string_array_len(const char *array[])
{
- int i =3D 0;<= br>+ size_t i =3D 0;<= br> if (array)
{
wh= ile (array[i])
@@ -141,14 +140,14 @@
}=
}

-static int
+static ssize_t
send_control(int fd, int code)
{
unsigned char c =3D (unsigned char) code= ;
const ssize_t size =3D write(fd, &c, sizeof(c));=
if (size =3D=3D sizeof(c))
{
- return (int) size= ;
+ return siz= e;
}
else
{<= /span>
@@ -281,7 +280,6 @@
openvpn_plugin_open_v1= (unsigned int *type_mask, const char *argv[], const char *envp[]) {
struct down_root_context *context;- int i =3D 0;

/*
* Allocate our context
@@ -320,7 +318,7 @@
}
<= /span>
/* Ignore argv[0], as it contains just the plug-in fil= e name */
- for (i = =3D 1; i < string_array_len(argv); i++)
+ for (int i =3D 1; i < string_array_len(argv);= i++)
{
context->command[i= -1] =3D (char *) argv[i];
}

To view, visit change 1111. To unsubscribe, or for help writing mail = filters, visit settings.=

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id61df43bd79fc794a55e107daa0= 218c8441c2b2c
Gerrit-Change-Number: 1111
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--JwhZSkLWV04=--