Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email
to review the following change.
Change subject: Collect trivial conversion fixes
......................................................................
Collect trivial conversion fixes
These are very local, simple fixes that do not
warrant their own commit.
Change-Id: Id565ec17856444b580dd89edab92e9fe18d39b77
Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com>
---
M src/openvpn/crypto.c
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/pool.c
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/40/1140/1
diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c
index e128bb8..f7a0206 100644
--- a/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c
@@ -1901,7 +1901,7 @@
const char *seed = "tls1-prf-test";
const char *secret = "tls1-prf-test-secret";
uint8_t out[8];
- uint8_t expected_out[] = { 'q', 'D', '\xfe', '%', '@', 's', 'u', '\x95' };
+ uint8_t expected_out[] = { 'q', 'D', 0xfe, '%', '@', 's', 'u', 0x95 };
int ret = ssl_tls1_PRF((uint8_t *)seed, strlen(seed), (uint8_t *)secret,
strlen(secret), out, sizeof(out));
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 2d6dacd..3cbdcf8 100644
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -343,7 +343,7 @@
const char *status = (ce->flags & CE_DISABLED) ? "disabled" :
"enabled";
/* space for output including 3 commas and a nul */
- int len =
+ size_t len =
strlen(ce->remote) + strlen(ce->remote_port) + strlen(proto) +
strlen(status) + 3 + 1;
char *out = malloc(len);
check_malloc_return(out);
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 2fffa65..670718f 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -4960,7 +4960,7 @@
#endif
static inline bool
-space(unsigned char c)
+space(char c)
{
return c == '\0' || isspace(c);
}
diff --git a/src/openvpn/pool.c b/src/openvpn/pool.c
index abbad8f..cd1c768 100644
--- a/src/openvpn/pool.c
+++ b/src/openvpn/pool.c
@@ -158,7 +158,7 @@
switch (pool->ipv4.type)
{
case IFCONFIG_POOL_30NET:
- pool->ipv4.base = start & ~3;
+ pool->ipv4.base = start & ~3u;
pool_ipv4_size = (((end | 3) + 1) - pool->ipv4.base) >> 2;
break;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id565ec17856444b580dd89edab92e9fe18d39b77
Gerrit-Change-Number: 1140
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
