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/+/1437?usp=email
to review the following change.
Change subject: buffer: Change buf_prepend and buf_advance to accept ssize_t
for length
......................................................................
buffer: Change buf_prepend and buf_advance to accept ssize_t for length
We already have tests to make sure the value is sane.
Changing the argument to ssize_t allows to use it in
more places without needing to do a cast before the
checks.
Change-Id: I123002255b37160d48ef6481f68a89d03073236b
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/buffer.c
M src/openvpn/buffer.h
M src/openvpn/ps.c
3 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/1437/1
diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c
index 293622f..aae4104 100644
--- a/src/openvpn/buffer.c
+++ b/src/openvpn/buffer.c
@@ -789,7 +789,7 @@
{
if (buf_string_match_head_str(src, match))
{
- buf_advance(src, (int)strlen(match));
+ buf_advance(src, strlen(match));
return true;
}
else
@@ -1312,7 +1312,7 @@
}
void
-buffer_list_advance(struct buffer_list *ol, int n)
+buffer_list_advance(struct buffer_list *ol, ssize_t n)
{
if (ol->head)
{
diff --git a/src/openvpn/buffer.h b/src/openvpn/buffer.h
index ab2a29d..5444dfd 100644
--- a/src/openvpn/buffer.h
+++ b/src/openvpn/buffer.h
@@ -601,26 +601,26 @@
*/
static inline uint8_t *
-buf_prepend(struct buffer *buf, int size)
+buf_prepend(struct buffer *buf, ssize_t size)
{
if (!buf_valid(buf) || size < 0 || size > buf->offset)
{
return NULL;
}
- buf->offset -= size;
- buf->len += size;
+ buf->offset -= (int)size;
+ buf->len += (int)size;
return BPTR(buf);
}
static inline bool
-buf_advance(struct buffer *buf, int size)
+buf_advance(struct buffer *buf, ssize_t size)
{
if (!buf_valid(buf) || size < 0 || buf->len < size)
{
return false;
}
- buf->offset += size;
- buf->len -= size;
+ buf->offset += (int)size;
+ buf->len -= (int)size;
return true;
}
@@ -1175,7 +1175,7 @@
*/
struct buffer *buffer_list_peek(struct buffer_list *ol);
-void buffer_list_advance(struct buffer_list *ol, int n);
+void buffer_list_advance(struct buffer_list *ol, ssize_t n);
void buffer_list_pop(struct buffer_list *ol);
diff --git a/src/openvpn/ps.c b/src/openvpn/ps.c
index 31e7c25..917f871 100644
--- a/src/openvpn/ps.c
+++ b/src/openvpn/ps.c
@@ -596,7 +596,7 @@
{
dmsg(D_PS_PROXY_DEBUG, "PORT SHARE PROXY: partial write[%d],
tried=%d got=%zd", (int)sd,
pc->buf.len, status);
- buf_advance(&pc->buf, (int)status);
+ buf_advance(&pc->buf, status);
return IOSTAT_EAGAIN_ON_WRITE;
}
else
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1437?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: I123002255b37160d48ef6481f68a89d03073236b
Gerrit-Change-Number: 1437
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[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
