Fix some warnings in storage.c.

4 files changed, 9 insertions, 9 deletions

diff --git a/lib/base64.c b/lib/base64.c
index 69069dae..64e9692a 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -30,10 +30,10 @@ static const char real_b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuv
 
 char *tobase64(const char *text)
 {
-	return base64_encode(text, strlen(text));
+	return base64_encode((const unsigned char *)text, strlen(text));
 }
 
-char *base64_encode(const char *in, int len)
+char *base64_encode(const unsigned char *in, int len)
 {
 	char *out;
 	
diff --git a/lib/base64.h b/lib/base64.h
index 570f2b14..ebd74bf1 100644
--- a/lib/base64.h
+++ b/lib/base64.h
@@ -26,7 +26,7 @@
 #include <gmodule.h>
 
 G_MODULE_EXPORT char *tobase64( const char *text );
-G_MODULE_EXPORT char *base64_encode( const char *in, int len );
+G_MODULE_EXPORT char *base64_encode( const unsigned char *in, int len );
 G_MODULE_EXPORT int base64_encode_real( const unsigned char *in, int inlen, unsigned char *out, const char *b64digits );
 G_MODULE_EXPORT char *frombase64( const char *in );
 G_MODULE_EXPORT int base64_decode( const char *in, unsigned char **out );
diff --git a/lib/rc4.c b/lib/rc4.c
index f2c76f54..635b802a 100644
--- a/lib/rc4.c
+++ b/lib/rc4.c
@@ -121,7 +121,7 @@ unsigned char rc4_getbyte( struct rc4_state *st )
    Both functions return the number of bytes in the result string.
 */
 
-int rc4_encode( unsigned char *clear, int clear_len, unsigned char **crypt, char *password )
+int rc4_encode( char *clear, int clear_len, unsigned char **crypt, char *password )
 {
 	struct rc4_state *st;
 	unsigned char *key;
@@ -129,7 +129,7 @@ int rc4_encode( unsigned char *clear, int clear_len, unsigned char **crypt, char
 	
 	key_len = strlen( password ) + RC4_IV_LEN;
 	if( clear_len <= 0 )
-		clear_len = strlen( (char*) clear );
+		clear_len = strlen( clear );
 	
 	/* Prepare buffers and the key + IV */
 	*crypt = g_malloc( clear_len + RC4_IV_LEN );
@@ -153,7 +153,7 @@ int rc4_encode( unsigned char *clear, int clear_len, unsigned char **crypt, char
 	return clear_len + RC4_IV_LEN;
 }
 
-int rc4_decode( unsigned char *crypt, int crypt_len, unsigned char **clear, char *password )
+int rc4_decode( unsigned char *crypt, int crypt_len, char **clear, char *password )
 {
 	struct rc4_state *st;
 	unsigned char *key;
@@ -164,7 +164,7 @@ int rc4_decode( unsigned char *crypt, int crypt_len, unsigned char **clear, char
 	
 	if( clear_len < 0 )
 	{
-		*clear = (unsigned char*) g_strdup( "" );
+		*clear = g_strdup( "" );
 		return 0;
 	}
 	
diff --git a/lib/rc4.h b/lib/rc4.h
index 2d4d3cc8..52de06b1 100644
--- a/lib/rc4.h
+++ b/lib/rc4.h
@@ -32,5 +32,5 @@ struct rc4_state
 
 struct rc4_state *rc4_keymaker( unsigned char *key, int kl, int cycles );
 unsigned char rc4_getbyte( struct rc4_state *st );
-int rc4_encode( unsigned char *clear, int clear_len, unsigned char **crypt, char *password );
-int rc4_decode( unsigned char *crypt, int crypt_len, unsigned char **clear, char *password );
+int rc4_encode( char *clear, int clear_len, unsigned char **crypt, char *password );
+int rc4_decode( unsigned char *crypt, int crypt_len, char **clear, char *password );