From dcd94de076eb8d68885eda4210a69e3716cb95b5 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 14 Jul 2013 12:12:29 +0200 Subject: [PATCH] error: Use new logging function. --- include/libssh/priv.h | 4 ++++ src/error.c | 8 +++----- src/log.c | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 35a6e4f3..15855ff8 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -152,6 +152,10 @@ struct ssh_kex_struct; int ssh_get_key_params(ssh_session session, ssh_key *privkey); /* LOGGING */ +void ssh_log_function(int verbosity, + const char *function, + const char *buffer); + void _ssh_log(int verbosity, const char *function, const char *format, ...) PRINTF_ATTRIBUTE(3, 4); diff --git a/src/error.c b/src/error.c index f4a2af00..e30e7b03 100644 --- a/src/error.c +++ b/src/error.c @@ -61,11 +61,9 @@ void _ssh_set_error(void *error, va_end(va); err->error.error_code = code; - ssh_log_common(err, - SSH_LOG_WARN, - function, - "Error: %s", - err->error.error_buffer); + ssh_log_function(SSH_LOG_WARN, + function, + err->error.error_buffer); } /** diff --git a/src/log.c b/src/log.c index 9396cb93..fba5fdc4 100644 --- a/src/log.c +++ b/src/log.c @@ -91,9 +91,9 @@ static void ssh_log_stderr(int verbosity, fprintf(stderr, " %s\n", buffer); } -static void ssh_log_function(int verbosity, - const char *function, - const char *buffer) +void ssh_log_function(int verbosity, + const char *function, + const char *buffer) { ssh_logging_callback log_fn = ssh_get_log_callback(); if (log_fn) {