Fixed warnings on MacosX with Xcode4

This commit is contained in:
Aris Adamantiadis
2011-05-20 14:31:13 +02:00
parent 837896e72d
commit a053d819a3
2 changed files with 13 additions and 7 deletions

View File

@@ -87,7 +87,6 @@ set(libssh_SRCS
dh.c dh.c
error.c error.c
getpass.c getpass.c
gcrypt_missing.c
gzip.c gzip.c
init.c init.c
kex.c kex.c
@@ -96,7 +95,6 @@ set(libssh_SRCS
known_hosts.c known_hosts.c
legacy.c legacy.c
libcrypto.c libcrypto.c
libgcrypt.c
log.c log.c
match.c match.c
messages.c messages.c
@@ -114,6 +112,14 @@ set(libssh_SRCS
wrapper.c wrapper.c
) )
if (WITH_GCRYPT)
set(libssh_SRCS
${libssh_SRCS}
libgcrypt.c
gcrypt_missing.c
)
endif (WITH_GCRYPT)
if (WITH_SFTP) if (WITH_SFTP)
set(libssh_SRCS set(libssh_SRCS
${libssh_SRCS} ${libssh_SRCS}

View File

@@ -667,21 +667,21 @@ SSH_PACKET_CALLBACK(channel_rcv_request) {
} }
if (strcmp(request,"signal") == 0) { if (strcmp(request,"signal") == 0) {
ssh_string signal; ssh_string signal_str;
char *sig; char *sig;
SAFE_FREE(request); SAFE_FREE(request);
ssh_log(session, SSH_LOG_PACKET, "received signal"); ssh_log(session, SSH_LOG_PACKET, "received signal");
signal = buffer_get_ssh_string(packet); signal_str = buffer_get_ssh_string(packet);
if (signal == NULL) { if (signal_str == NULL) {
ssh_log(session, SSH_LOG_PACKET, "Invalid MSG_CHANNEL_REQUEST"); ssh_log(session, SSH_LOG_PACKET, "Invalid MSG_CHANNEL_REQUEST");
leave_function(); leave_function();
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
sig = ssh_string_to_char(signal); sig = ssh_string_to_char(signal_str);
ssh_string_free(signal); ssh_string_free(signal_str);
if (sig == NULL) { if (sig == NULL) {
leave_function(); leave_function();
return SSH_PACKET_USED; return SSH_PACKET_USED;