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>2016-01-19 11:31:08 +0100
commitac0cf12c20072977bc621c095148e563a33ba754 (patch)
treebc68aa73a36e311ed6d7a2c9bf177a9cf1962a87
parent094bef2470178e9b5d6c1fb4aa774001750ea909 (diff)
downloadlibssh-ac0cf12c20072977bc621c095148e563a33ba754.tar.gz
libssh-ac0cf12c20072977bc621c095148e563a33ba754.tar.xz
libssh-ac0cf12c20072977bc621c095148e563a33ba754.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 33608f1d..11e0f4fc 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -679,6 +679,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