Changeset 3b6eadc for lib

Timestamp:

2007-07-07T17:19:28Z (17 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

b9e4ab5

Parents:

f7b44f2

Message:

Fix some warnings in storage.c.

Location:

lib

Files:

• base64.c (modified) (1 diff)
• base64.h (modified) (1 diff)
• rc4.c (modified) (4 diffs)
• rc4.h (modified) (1 diff)

lib/base64.c

@@ -31 +31 @@
 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;

lib/base64.h

@@ -27 +27 @@
 
 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 );

lib/rc4.c

@@ -122 +122 @@
 */
 
-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;
@@ -130 +130 @@
         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 */
@@ -154 +154 @@
 }
 
-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;
@@ -165 +165 @@
         if( clear_len < 0 )
         {
-                *clear = (unsigned char*) g_strdup( "" );
+                *clear = g_strdup( "" );
                 return 0;
         }

lib/rc4.h

@@ -33 +33 @@
 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 );