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/+/1398?usp=email
to review the following change.
Change subject: iservice: rename one_glyph to glyph_size
......................................................................
iservice: rename one_glyph to glyph_size
Throughout the function variables which deal with byte counts have a
_size postfix. one_glyph is the number of bytes in one character.
Reading the code is easier and more consistent this way.
Change-Id: I69a6ab59d995fb4a511f57c8535b5ffa4048673c
Signed-off-by: Heiko Hund <[email protected]>
---
M src/openvpnserv/interactive.c
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/98/1398/1
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 23d18aa..3d5f305 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -2156,14 +2156,14 @@
LSTATUS err = ERROR_FILE_NOT_FOUND;
const DWORD buf_size = *size;
- const size_t one_glyph = sizeof(*domains);
+ const size_t glyph_size = sizeof(*domains);
PWSTR values[] = { L"SearchList", L"Domain", L"DhcpDomainSearchList",
L"DhcpDomain", NULL };
for (int i = 0; values[i]; i++)
{
*size = buf_size;
err = RegGetValueW(itf, NULL, values[i], RRF_RT_REG_SZ, NULL,
(PBYTE)domains, size);
- if (!err && *size > one_glyph && domains[(*size / one_glyph) - 1] ==
'\0' && wcschr(domains, '.'))
+ if (!err && *size > glyph_size && domains[(*size / glyph_size) - 1] ==
'\0' && wcschr(domains, '.'))
{
/*
* Found domain(s), now convert them:
@@ -2171,7 +2171,7 @@
* - convert comma separated list to MULTI_SZ
*/
PWCHAR pos = domains;
- const DWORD buf_len = buf_size / one_glyph;
+ const DWORD buf_len = buf_size / glyph_size;
while (TRUE)
{
/* Terminate the domain at the next comma */
@@ -2182,8 +2182,8 @@
}
size_t domain_len = wcslen(pos);
- size_t domain_size = domain_len * one_glyph;
- size_t converted_size = (pos - domains) * one_glyph;
+ size_t domain_size = domain_len * glyph_size;
+ size_t converted_size = (pos - domains) * glyph_size;
/* Ignore itf domains which match a pushed search domain */
if (ListContainsDomain(search_domains, pos, domain_len))
@@ -2192,7 +2192,7 @@
{
/* Overwrite the ignored domain with remaining one(s)
*/
memmove(pos, comma + 1, buf_size - converted_size);
- *size -= domain_size + one_glyph;
+ *size -= domain_size + glyph_size;
continue;
}
else
@@ -2206,31 +2206,31 @@
/* Add space for the leading dot */
domain_len += 1;
- domain_size += one_glyph;
+ domain_size += glyph_size;
/* Space for the terminating zeros */
- size_t extra_size = 2 * one_glyph;
+ size_t extra_size = 2 * glyph_size;
/* Check for enough space to convert this domain */
if (converted_size + domain_size + extra_size > buf_size)
{
/* Domain doesn't fit, bad luck if it's the first one */
*pos = '\0';
- *size = converted_size == 0 ? 0 : converted_size +
one_glyph;
+ *size = converted_size == 0 ? 0 : converted_size +
glyph_size;
return ERROR_MORE_DATA;
}
/* Prefix domain at pos with the dot */
- memmove(pos + 1, pos, buf_size - converted_size - one_glyph);
+ memmove(pos + 1, pos, buf_size - converted_size - glyph_size);
domains[buf_len - 1] = '\0';
*pos = '.';
- *size += one_glyph;
+ *size += glyph_size;
if (!comma)
{
/* Conversion is done */
*(pos + domain_len) = '\0';
- *size += one_glyph;
+ *size += glyph_size;
return NO_ERROR;
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1398?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I69a6ab59d995fb4a511f57c8535b5ffa4048673c
Gerrit-Change-Number: 1398
Gerrit-PatchSet: 1
Gerrit-Owner: d12fk <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
