diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2015-06-04 23:08:50 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2015-06-04 23:08:50 +0800 |
| commit | d96a52541f0f89836e99fea2d1bb8e3f4a1f4144 (patch) | |
| tree | 4eedfa1c5b7e94fb6d930e2528c4d3eb6c27a7c2 /common-channel.c | |
| parent | ecd850521816dc2a78792fc53dd9c6c80d5d1b91 (diff) | |
| parent | 9fdab3ced8374b991bfadce0056cf5bdf7cfb3d6 (diff) | |
Merge pull request #13 from gazoo74/fix-warnings
Fix warnings
Diffstat (limited to 'common-channel.c')
| -rw-r--r-- | common-channel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common-channel.c b/common-channel.c index 5f4051e..abe5941 100644 --- a/common-channel.c +++ b/common-channel.c @@ -38,7 +38,7 @@ #include "netio.h" static void send_msg_channel_open_failure(unsigned int remotechan, int reason, - const unsigned char *text, const unsigned char *lang); + const char *text, const char *lang); static void send_msg_channel_open_confirmation(struct Channel* channel, unsigned int recvwindow, unsigned int recvmaxpacket); @@ -921,7 +921,7 @@ static void send_msg_channel_window_adjust(struct Channel* channel, /* Handle a new channel request, performing any channel-type-specific setup */ void recv_msg_channel_open() { - unsigned char *type; + char *type; unsigned int typelen; unsigned int remotechan, transwindow, transmaxpacket; struct Channel *channel; @@ -1039,7 +1039,7 @@ void send_msg_channel_success(struct Channel *channel) { /* Send a channel open failure message, with a corresponding reason * code (usually resource shortage or unknown chan type) */ static void send_msg_channel_open_failure(unsigned int remotechan, - int reason, const unsigned char *text, const unsigned char *lang) { + int reason, const char *text, const char *lang) { TRACE(("enter send_msg_channel_open_failure")) CHECKCLEARTOWRITE(); @@ -1047,8 +1047,8 @@ static void send_msg_channel_open_failure(unsigned int remotechan, buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_OPEN_FAILURE); buf_putint(ses.writepayload, remotechan); buf_putint(ses.writepayload, reason); - buf_putstring(ses.writepayload, text, strlen((char*)text)); - buf_putstring(ses.writepayload, lang, strlen((char*)lang)); + buf_putstring(ses.writepayload, text, strlen(text)); + buf_putstring(ses.writepayload, lang, strlen(lang)); encrypt_packet(); TRACE(("leave send_msg_channel_open_failure")) @@ -1244,7 +1244,7 @@ struct Channel* get_any_ready_channel() { } void start_send_channel_request(struct Channel *channel, - unsigned char *type) { + char *type) { CHECKCLEARTOWRITE(); buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST); |