summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabiano Fidêncio <fidencio@redhat.com>2015-09-25 01:33:23 +0200
committerFabiano Fidêncio <fidencio@redhat.com>2015-10-12 13:56:21 +0200
commit9312d4e553f9711dbb5dadce04d4b7c367c9fa1b (patch)
tree9fff1971a5339ff8e696a1521a1d6dafcf45fb96
parent7f0dd4d2a05427cff37fbb9d92e09185f0ada0db (diff)
downloadlibssh-9312d4e553f9711dbb5dadce04d4b7c367c9fa1b.tar.gz
libssh-9312d4e553f9711dbb5dadce04d4b7c367c9fa1b.tar.xz
libssh-9312d4e553f9711dbb5dadce04d4b7c367c9fa1b.zip
libssh.h: move LIBSSH_API buffer' functions to libssh.h
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
-rw-r--r--include/libssh/buffer.h4
-rw-r--r--include/libssh/libssh.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/libssh/buffer.h b/include/libssh/buffer.h
index 8134478f..a410bc5b 100644
--- a/include/libssh/buffer.h
+++ b/include/libssh/buffer.h
@@ -41,8 +41,6 @@ struct ssh_buffer_struct {
#define SSH_BUFFER_PACK_END ((uint32_t) 0x4f65feb3)
-LIBSSH_API void ssh_buffer_free(ssh_buffer buffer);
-LIBSSH_API ssh_buffer ssh_buffer_new(void);
void ssh_buffer_set_secure(ssh_buffer buffer);
int ssh_buffer_add_ssh_string(ssh_buffer buffer, ssh_string string);
int ssh_buffer_add_u8(ssh_buffer buffer, uint8_t data);
@@ -78,8 +76,6 @@ int ssh_buffer_reinit(ssh_buffer buffer);
/* ssh_buffer_get_rest returns a pointer to the current position into the buffer */
void *ssh_buffer_get(ssh_buffer buffer);
-/* ssh_buffer_get_len returns the number of bytes which can be read */
-LIBSSH_API uint32_t ssh_buffer_get_len(ssh_buffer buffer);
/* buffer_read_*() returns the number of bytes read, except for ssh strings */
int ssh_buffer_get_u8(ssh_buffer buffer, uint8_t *data);
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index aff01909..f4356bd9 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -678,6 +678,10 @@ LIBSSH_API const char* ssh_get_cipher_out(ssh_session session);
LIBSSH_API const char* ssh_get_hmac_in(ssh_session session);
LIBSSH_API const char* ssh_get_hmac_out(ssh_session session);
+LIBSSH_API ssh_buffer ssh_buffer_new(void);
+LIBSSH_API void ssh_buffer_free(ssh_buffer buffer);
+LIBSSH_API uint32_t ssh_buffer_get_len(ssh_buffer buffer);
+
#ifndef LIBSSH_LEGACY_0_4
#include "libssh/legacy.h"
#endif