From c4861340e93280dce97bbfa3b421c7819bc7864e Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Sat, 23 Mar 2013 23:17:01 +0800
Subject: [PATCH] Fix a few compile warnings
---
cli-agentfwd.c | 3 ---
cli-kex.c | 1 -
svr-main.c | 2 +-
svr-x11fwd.c | 2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/cli-agentfwd.c b/cli-agentfwd.c
index a8213056..c6614554 100644
--- a/cli-agentfwd.c
+++ b/cli-agentfwd.c
@@ -156,8 +156,6 @@ static buffer * agent_request(unsigned char type, buffer *data) {
goto out;
}
- TRACE(("agent_request readlen is %d", readlen))
-
buf_resize(inbuf, readlen);
buf_setpos(inbuf, 0);
ret = atomicio(read, fd, buf_getwriteptr(inbuf, readlen), readlen);
@@ -167,7 +165,6 @@ static buffer * agent_request(unsigned char type, buffer *data) {
}
buf_incrwritepos(inbuf, readlen);
buf_setpos(inbuf, 0);
- TRACE(("agent_request success, length %d", readlen))
out:
if (payload)
diff --git a/cli-kex.c b/cli-kex.c
index 0d5a9d2c..9dadb3cb 100644
--- a/cli-kex.c
+++ b/cli-kex.c
@@ -309,7 +309,6 @@ static void checkhostkey(unsigned char* keyblob, unsigned int keybloblen) {
buf_putbytes(line, algoname, algolen);
buf_putbyte(line, ' ');
len = line->size - line->pos;
- TRACE(("keybloblen %d, len %d", keybloblen, len))
/* The only failure with base64 is buffer_overflow, but buf_getwriteptr
* will die horribly in the case anyway */
base64_encode(keyblob, keybloblen, buf_getwriteptr(line, len), &len);
diff --git a/svr-main.c b/svr-main.c
index 43d66560..461aeaf5 100644
--- a/svr-main.c
+++ b/svr-main.c
@@ -271,7 +271,7 @@ void main_noinetd() {
goto out;
}
- addrandom(&fork_ret, sizeof(fork_ret));
+ addrandom((void*)&fork_ret, sizeof(fork_ret));
if (fork_ret > 0) {
diff --git a/svr-x11fwd.c b/svr-x11fwd.c
index 92dadd5c..f6368d7e 100644
--- a/svr-x11fwd.c
+++ b/svr-x11fwd.c
@@ -175,7 +175,7 @@ void x11cleanup(struct ChanSess *chansess) {
m_free(chansess->x11authprot);
m_free(chansess->x11authcookie);
- TRACE(("chansess %x", chansess))
+ TRACE(("chansess %p", chansess))
if (chansess->x11listener != NULL) {
remove_listener(chansess->x11listener);
chansess->x11listener = NULL;
--
GitLab