cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1136?usp=email )
Change subject: manage: Change command_line_* API to use size_t for lengths ...................................................................... manage: Change command_line_* API to use size_t for lengths The used functions already expect this. Change-Id: Ifc183e42b190e19e1d8c351d1cd460a038626e63 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1136 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg32929.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/manage.c M src/openvpn/manage.h 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 114e4c6..4decdfe 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -2334,7 +2334,7 @@ bool processed_command = false; ASSERT(len <= (int)sizeof(buf)); - command_line_add(man->connection.in, buf, len); + command_line_add(man->connection.in, buf, (size_t)len); /* * Reset output object @@ -3873,7 +3873,7 @@ */ struct command_line * -command_line_new(const int buf_len) +command_line_new(const size_t buf_len) { struct command_line *cl; ALLOC_OBJ_CLEAR(cl, struct command_line); @@ -3903,10 +3903,9 @@ } void -command_line_add(struct command_line *cl, const unsigned char *buf, const int len) +command_line_add(struct command_line *cl, const unsigned char *buf, const size_t len) { - int i; - for (i = 0; i < len; ++i) + for (size_t i = 0; i < len; ++i) { if (buf[i] && char_class(buf[i], (CC_PRINT | CC_NEWLINE))) { @@ -3921,10 +3920,9 @@ const char * command_line_get(struct command_line *cl) { - int i; const char *ret = NULL; - i = buf_substring_len(&cl->buf, '\n'); + int i = buf_substring_len(&cl->buf, '\n'); if (i >= 0) { buf_copy_excess(&cl->residual, &cl->buf, i); diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index 0bce25e..7c189ba 100644 --- a/src/openvpn/manage.h +++ b/src/openvpn/manage.h @@ -80,11 +80,11 @@ struct buffer residual; }; -struct command_line *command_line_new(const int buf_len); +struct command_line *command_line_new(const size_t buf_len); void command_line_free(struct command_line *cl); -void command_line_add(struct command_line *cl, const unsigned char *buf, const int len); +void command_line_add(struct command_line *cl, const unsigned char *buf, const size_t len); const char *command_line_get(struct command_line *cl); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1136?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: Ifc183e42b190e19e1d8c351d1cd460a038626e63 Gerrit-Change-Number: 1136 Gerrit-PatchSet: 6 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]> Gerrit-MessageType: merged
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
