diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-05-20 14:31:13 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-05-20 14:31:13 +0200 |
| commit | a053d819a3c9c734f42a13527d6bb0fe8efbe730 (patch) | |
| tree | 31ce06cca4c15c43c053818542e34c9183ba3ab1 /src | |
| parent | 837896e72d98cc0a840ca8bba1c4619d37bfe2f7 (diff) | |
| download | libssh-a053d819a3c9c734f42a13527d6bb0fe8efbe730.tar.gz libssh-a053d819a3c9c734f42a13527d6bb0fe8efbe730.tar.xz libssh-a053d819a3c9c734f42a13527d6bb0fe8efbe730.zip | |
Fixed warnings on MacosX with Xcode4
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/channels.c | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2b478539..0cfa72d3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -87,7 +87,6 @@ set(libssh_SRCS dh.c error.c getpass.c - gcrypt_missing.c gzip.c init.c kex.c @@ -96,7 +95,6 @@ set(libssh_SRCS known_hosts.c legacy.c libcrypto.c - libgcrypt.c log.c match.c messages.c @@ -114,6 +112,14 @@ set(libssh_SRCS wrapper.c ) +if (WITH_GCRYPT) + set(libssh_SRCS + ${libssh_SRCS} + libgcrypt.c + gcrypt_missing.c + ) +endif (WITH_GCRYPT) + if (WITH_SFTP) set(libssh_SRCS ${libssh_SRCS} diff --git a/src/channels.c b/src/channels.c index b9ba0514..02999037 100644 --- a/src/channels.c +++ b/src/channels.c @@ -667,21 +667,21 @@ SSH_PACKET_CALLBACK(channel_rcv_request) { } if (strcmp(request,"signal") == 0) { - ssh_string signal; + ssh_string signal_str; char *sig; SAFE_FREE(request); ssh_log(session, SSH_LOG_PACKET, "received signal"); - signal = buffer_get_ssh_string(packet); - if (signal == NULL) { + signal_str = buffer_get_ssh_string(packet); + if (signal_str == NULL) { ssh_log(session, SSH_LOG_PACKET, "Invalid MSG_CHANNEL_REQUEST"); leave_function(); return SSH_PACKET_USED; } - sig = ssh_string_to_char(signal); - ssh_string_free(signal); + sig = ssh_string_to_char(signal_str); + ssh_string_free(signal_str); if (sig == NULL) { leave_function(); return SSH_PACKET_USED; |