From a63ff7f427716d0adfed8f14238a66867605c612 Mon Sep 17 00:00:00 2001 From: Sean Middleditch Date: Fri, 3 Apr 2009 01:27:06 -0400 Subject: [PATCH 1/2] minor formatting update --- libtelnet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libtelnet.c b/libtelnet.c index 67ec6c0..6ee8e25 100644 --- a/libtelnet.c +++ b/libtelnet.c @@ -241,8 +241,8 @@ static INLINE void _set_rfc1143(telnet_t *telnet, unsigned char telopt, * to the number of enabled options for most simple code, and it * allows for an acceptable number of reallocations for complex code. */ - if ((qtmp = (telnet_rfc1143_t *)realloc(telnet->q, sizeof( - telnet_rfc1143_t) * (telnet->q_size + 1))) == 0) { + if ((qtmp = (telnet_rfc1143_t *)realloc(telnet->q, + sizeof(telnet_rfc1143_t) * (telnet->q_size + 4))) == 0) { _error(telnet, __LINE__, __func__, TELNET_ENOMEM, 0, "malloc() failed: %s", strerror(errno)); return; From 0003f051d9e2a1634cfa7fbaa165f106e3318952 Mon Sep 17 00:00:00 2001 From: Sean Middleditch Date: Mon, 27 Apr 2009 19:26:05 -0400 Subject: [PATCH 2/2] signedness warnings silence --- libtelnet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libtelnet.c b/libtelnet.c index 6ee8e25..aa1117e 100644 --- a/libtelnet.c +++ b/libtelnet.c @@ -932,7 +932,7 @@ void telnet_send(telnet_t *telnet, const char *buffer, for (l = i = 0; i != size; ++i) { /* dump prior portion of text, send escaped bytes */ - if (buffer[i] == TELNET_IAC) { + if (buffer[i] == (char)TELNET_IAC) { /* dump prior text if any */ if (i != l) _send(telnet, buffer + l, i - l); @@ -1017,7 +1017,7 @@ int telnet_printf(telnet_t *telnet, const char *fmt, ...) { /* send */ for (l = i = 0; i != rs; ++i) { /* special characters */ - if (buffer[i] == TELNET_IAC || buffer[i] == '\r' || + if (buffer[i] == (char)TELNET_IAC || buffer[i] == '\r' || buffer[i] == '\n') { /* dump prior portion of text */ if (i != l) @@ -1025,7 +1025,7 @@ int telnet_printf(telnet_t *telnet, const char *fmt, ...) { l = i + 1; /* IAC -> IAC IAC */ - if (buffer[i] == TELNET_IAC) + if (buffer[i] == (char)TELNET_IAC) telnet_iac(telnet, TELNET_IAC); /* automatic translation of \r -> CRNUL */ else if (buffer[i] == '\r')