[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 21/24] libssh.h: move LIBSSH_API buffer' functions to libssh.h
[Thread Prev] | [Thread Next]
- Subject: [PATCH 21/24] libssh.h: move LIBSSH_API buffer' functions to libssh.h
- From: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
- Reply-to: libssh@xxxxxxxxxx
- Date: Mon, 18 Jan 2016 10:07:02 +0100
- To: libssh@xxxxxxxxxx
- Cc: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
---
include/libssh/buffer.h | 4 ----
include/libssh/libssh.h | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/libssh/buffer.h b/include/libssh/buffer.h
index 8134478..a410bc5 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 33608f1..11e0f4f 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
--
2.5.0
| [PATCH 00/24] clean up + expose some buffer functions (the ones necessary for writing an ssh-agent). | Fabiano Fidêncio <fidencio@xxxxxxxxxx> |