Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1171?usp=email
to review the following change.
Change subject: replace assert() calls with ASSERT()
......................................................................
replace assert() calls with ASSERT()
OpenVPN's ASSERT() macro will do a bit more than the standard-libc
assert() call, namely print out which function and what expression
failed, before calling _exit(1). Also, it can not be accidentially
compiled-away (-DNDEBUG).
Use of ASSERT() generally only advised in cases of "this must not happen,
but if it does, it's a programming or state corruption error that we
must know about". Use of assert() is lacking the extra debug info, and as
such, not advised at all.
Change-Id: I6480d6f741c2368a0d951004b91167d5943f8f9d
Signed-off-by: Gert Doering <g...@greenie.muc.de>
---
M src/openvpn/dco_freebsd.c
M src/openvpn/init.c
M src/openvpn/options.c
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/71/1171/1
diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c
index 931f9f6..65303cd 100644
--- a/src/openvpn/dco_freebsd.c
+++ b/src/openvpn/dco_freebsd.c
@@ -100,7 +100,7 @@
in->sin_len = sizeof(*in);
data = nvlist_get_binary(nvl, "address", &len);
- assert(len == sizeof(in->sin_addr));
+ ASSERT(len == sizeof(in->sin_addr));
memcpy(&in->sin_addr, data, sizeof(in->sin_addr));
in->sin_port = nvlist_get_number(nvl, "port");
break;
@@ -114,7 +114,7 @@
in6->sin6_len = sizeof(*in6);
data = nvlist_get_binary(nvl, "address", &len);
- assert(len == sizeof(in6->sin6_addr));
+ ASSERT(len == sizeof(in6->sin6_addr));
memcpy(&in6->sin6_addr, data, sizeof(in6->sin6_addr));
in6->sin6_port = nvlist_get_number(nvl, "port");
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 39ea8e4..2821cd4 100644
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -319,7 +319,7 @@
static unsigned int
management_callback_remote_entry_count(void *arg)
{
- assert(arg);
+ ASSERT(arg);
struct context *c = (struct context *)arg;
struct connection_list *l = c->options.connection_list;
@@ -329,8 +329,8 @@
static bool
management_callback_remote_entry_get(void *arg, unsigned int index, char
**remote)
{
- assert(arg);
- assert(remote);
+ ASSERT(arg);
+ ASSERT(remote);
struct context *c = (struct context *)arg;
struct connection_list *l = c->options.connection_list;
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 0616a17..6858a69 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3486,9 +3486,9 @@
{
/* Copy --dhcp-options to tuntap_options */
struct dhcp_options *dhcp = &dns->from_dhcp;
- assert(sizeof(dhcp->dns) == sizeof(tt->dns));
- assert(sizeof(dhcp->dns6) == sizeof(tt->dns6));
- assert(sizeof(dhcp->domain_search_list) ==
sizeof(tt->domain_search_list));
+ ASSERT(sizeof(dhcp->dns) == sizeof(tt->dns));
+ ASSERT(sizeof(dhcp->dns6) == sizeof(tt->dns6));
+ ASSERT(sizeof(dhcp->domain_search_list) ==
sizeof(tt->domain_search_list));
tt->domain = dhcp->domain;
tt->dns_len = dhcp->dns_len;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1171?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: I6480d6f741c2368a0d951004b91167d5943f8f9d
Gerrit-Change-Number: 1171
Gerrit-PatchSet: 1
Gerrit-Owner: cron2 <g...@greenie.muc.de>
Gerrit-Reviewer: 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-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
