From 20312e23b75b52258d0505e08f342b5c8a47bd9f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 21 Jul 2013 11:53:55 +0200 Subject: log: Make _ssh_log() public. --- include/libssh/libssh.h | 3 +++ include/libssh/libsshpp.hpp | 2 +- include/libssh/priv.h | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'include/libssh') diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index f2b587a6..a451620e 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -423,6 +423,9 @@ LIBSSH_API int ssh_set_log_level(int level); LIBSSH_API int ssh_get_log_level(void); LIBSSH_API void *ssh_get_log_userdata(void); LIBSSH_API int ssh_set_log_userdata(void *data); +LIBSSH_API void _ssh_log(int verbosity, + const char *function, + const char *format, ...) PRINTF_ATTRIBUTE(3, 4); /* legacy */ SSH_DEPRECATED LIBSSH_API void ssh_log(ssh_session session, diff --git a/include/libssh/libsshpp.hpp b/include/libssh/libsshpp.hpp index 16e27dd8..1a5d80a9 100644 --- a/include/libssh/libsshpp.hpp +++ b/include/libssh/libsshpp.hpp @@ -316,7 +316,7 @@ public: va_start(va, format); vsnprintf(buffer, sizeof(buffer), format, va); va_end(va); - ssh_log(c_session,priority, "%s", buffer); + _ssh_log(priority, "libsshpp", "%s", buffer); } /** @brief copies options from a session to another diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 64a07451..e27c66a0 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -152,10 +152,6 @@ int ssh_get_key_params(ssh_session session, ssh_key *privkey); 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); #define SSH_LOG(priority, ...) \ _ssh_log(priority, __FUNCTION__, __VA_ARGS__) -- cgit v1.2.3