aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2009-02-02 15:14:19 +0000
committerAndreas Schneider <mail@cynapses.org>2009-02-02 15:14:19 +0000
commitf4d74e285e9af06c1da245198faa366d6f1e06c4 (patch)
tree3826ddca3194ff99756d6cebbd3d01b9a0660f5b
parentfc0928a5721041e70807c33bd16fe852225d97f7 (diff)
downloadlibssh-f4d74e285e9af06c1da245198faa366d6f1e06c4.tar.gz
libssh-f4d74e285e9af06c1da245198faa366d6f1e06c4.tar.xz
libssh-f4d74e285e9af06c1da245198faa366d6f1e06c4.zip
Fix compiler warnings in buffer implementation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@206 7dcaeef0-15fb-0310-b436-a5af3365683c
-rw-r--r--include/libssh/libssh.h2
-rw-r--r--include/libssh/priv.h12
-rw-r--r--libssh/buffer.c8
3 files changed, 11 insertions, 11 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 406d3d9c..137531a3 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -308,7 +308,7 @@ void ssh_options_set_auth_callback(SSH_OPTIONS *opt, ssh_auth_callback cb,
/** creates a new buffer
*/
-BUFFER *buffer_new();
+BUFFER *buffer_new(void);
void buffer_free(BUFFER *buffer);
/* buffer_get returns a pointer to the begining of the buffer. no position is taken into account */
void *buffer_get(BUFFER *buffer);
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 907fd19f..98b76bb2 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -154,9 +154,9 @@ struct string_struct {
*/
struct buffer_struct {
char *data;
- int used;
- int allocated;
- int pos;
+ u32 used;
+ u32 allocated;
+ u32 pos;
};
/* i should remove it one day */
@@ -599,14 +599,14 @@ int buffer_get_u8(BUFFER *buffer,u8 *data);
int buffer_get_u32(BUFFER *buffer,u32 *data);
int buffer_get_u64(BUFFER *buffer, u64 *data);
-int buffer_get_data(BUFFER *buffer,void *data,int requestedlen);
+u32 buffer_get_data(BUFFER *buffer, void *data, u32 requestedlen);
/* buffer_get_ssh_string() is an exception. if the String read is too large or invalid, it will answer NULL. */
STRING *buffer_get_ssh_string(BUFFER *buffer);
/* gets a string out of a SSH-1 mpint */
STRING *buffer_get_mpint(BUFFER *buffer);
/* buffer_pass_bytes acts as if len bytes have been read (used for padding) */
-int buffer_pass_bytes_end(BUFFER *buffer,int len);
-int buffer_pass_bytes(BUFFER *buffer, int len);
+int buffer_pass_bytes_end(BUFFER *buffer, u32 len);
+int buffer_pass_bytes(BUFFER *buffer, u32 len);
/* in base64.c */
BUFFER *base64_to_bin(char *source);
diff --git a/libssh/buffer.c b/libssh/buffer.c
index 60eceef2..a5d6cc3f 100644
--- a/libssh/buffer.c
+++ b/libssh/buffer.c
@@ -33,7 +33,7 @@ MA 02111-1307, USA. */
/** \brief creates a new buffer
* \return a new initialized buffer
*/
-BUFFER *buffer_new(){
+BUFFER *buffer_new(void) {
BUFFER *buffer=malloc(sizeof(BUFFER));
memset(buffer,0,sizeof(BUFFER));
return buffer;
@@ -195,7 +195,7 @@ int buffer_get_rest_len(BUFFER *buffer){
* \param len number of bytes to eat
* \return new size of the buffer
*/
-int buffer_pass_bytes(BUFFER *buffer,int len){
+int buffer_pass_bytes(BUFFER *buffer, u32 len){
if(buffer->used < buffer->pos+len)
return 0;
buffer->pos+=len;
@@ -213,7 +213,7 @@ int buffer_pass_bytes(BUFFER *buffer,int len){
* \param len number of bytes to remove from tail
* \return new size of the buffer
*/
-int buffer_pass_bytes_end(BUFFER *buffer,int len){
+int buffer_pass_bytes_end(BUFFER *buffer, u32 len){
if(buffer->used < buffer->pos + len)
return 0;
buffer->used-=len;
@@ -228,7 +228,7 @@ int buffer_pass_bytes_end(BUFFER *buffer,int len){
* \returns 0 if there is not enough data in buffer
* \returns len otherwise.
*/
-int buffer_get_data(BUFFER *buffer, void *data, int len){
+u32 buffer_get_data(BUFFER *buffer, void *data, u32 len){
if(buffer->pos+len>buffer->used)
return 0; /*no enough data in buffer */
memcpy(data,buffer->data+buffer->pos,len);