summaryrefslogtreecommitdiffstats
path: root/libssh/log.c
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2009-10-05 10:01:24 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2009-10-05 10:01:24 +0200
commit40778d4ba94ab5bfbe71bd3a304d6664c9a02560 (patch)
tree5864e2c4bda6c2d1782ef0ba765a40fcd8b8e8c5 /libssh/log.c
parenta3a7f17d0f971edce873970863cfe660b21d8f57 (diff)
parent60d6954b7560df62634b305fec65dffbc98ff0b8 (diff)
downloadlibssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.tar.gz
libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.tar.xz
libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.zip
Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
Diffstat (limited to 'libssh/log.c')
-rw-r--r--libssh/log.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libssh/log.c b/libssh/log.c
index d119f541..0dab4aef 100644
--- a/libssh/log.c
+++ b/libssh/log.c
@@ -27,7 +27,6 @@
#include "libssh/priv.h"
#include "libssh/session.h"
-#include "libssh/options.h"
/**
* @defgroup ssh_log SSH Logging
@@ -57,9 +56,9 @@ void ssh_log(ssh_session session, int verbosity, const char *format, ...) {
vsnprintf(buffer, sizeof(buffer), format, va);
va_end(va);
- if (session->options->callbacks && session->options->callbacks->log_function) {
- session->options->callbacks->log_function(session, verbosity, buffer,
- session->options->callbacks->userdata);
+ if (session->callbacks && session->callbacks->log_function) {
+ session->callbacks->log_function(session, verbosity, buffer,
+ session->callbacks->userdata);
} else if (verbosity == SSH_LOG_FUNCTIONS) {
if (session->log_indent > 255) {
min = 255;