[Nufw-devel] [PATCH 4 of 7] gcrypt.c: kill a few warnings

[Mikael Berthe]

# HG changeset patch
# User Mikael Berthe <address@hidden>
# Node ID c82e6c58aeef7d2c5753ae8812a71668f639be27
# Parent  dfc94cea699164f346798113f6e2a71a4fa5e39f
gcrypt.c: kill a few warnings

diff -r dfc94cea6991 -r c82e6c58aeef src/nuauth/gcrypt.c
--- a/src/nuauth/gcrypt.c       Sun Oct 23 21:28:26 2005 +0200
+++ b/src/nuauth/gcrypt.c       Sun Oct 23 21:57:18 2005 +0200
@@ -27,7 +27,7 @@
        gcry_md_hd_t hd;
        char * res;
        char* decoded; 
-       int len;
+       size_t len;
        char **splitted_secret; 
        int algo=0;
 
@@ -76,7 +76,6 @@
 
                if ((algo == GCRY_MD_SHA1) && seeded) {
                        char temp[24];
-                       int len;
 
                        if 
(sasl_decode64(splitted_secret[1],strlen(splitted_secret[1]),temp,24,&len) != 
SASL_OK){
                                if 
(DEBUG_OR_NOT(DEBUG_LEVEL_INFO,DEBUG_AREA_MAIN))
@@ -87,7 +86,6 @@
                }
                else if ((algo == GCRY_MD_MD5) && seeded) {
                        char temp[20];
-                       int len;
 
                        if 
(sasl_decode64(splitted_secret[1],strlen(splitted_secret[1]),temp,20,&len) != 
SASL_OK){
                                if 
(DEBUG_OR_NOT(DEBUG_LEVEL_INFO,DEBUG_AREA_MAIN))
@@ -104,7 +102,7 @@
 
                /* convert password from utf-8 to locale */
                if (nuauth_uses_utf8){
-                       int bwritten=0;
+                       size_t bwritten=0;
                        gchar * traduc;
                        traduc = g_locale_from_utf8  (decoded,
                                        -1,
@@ -181,7 +179,7 @@
        } else {
                /* convert password from utf-8 to locale */
                if (nuauth_uses_utf8){
-                       int bwritten=0;
+                       size_t bwritten=0;
                        gchar * traduc;
                        traduc = g_locale_from_utf8  (given,
                                        strlen(given),
@@ -192,7 +190,7 @@
                                given=traduc;
                        } else {
                                if 
(DEBUG_OR_NOT(DEBUG_LEVEL_WARNING,DEBUG_AREA_MAIN)){
-                                       char *ccharset;
+                                       const char *ccharset;
                                        g_get_charset(&ccharset);
                                        g_message("Can not convert password %s 
to %s at %s:%d",given,
                                                        
ccharset,__FILE__,__LINE__);
@@ -201,13 +199,13 @@
                }
                if (!strcmp(given,ours)){
                        if (nuauth_uses_utf8){
-                               g_free(given);
+                               g_free((char*)given);
                        }
                        return SASL_OK;
                }
                else {
                        if (nuauth_uses_utf8){
-                               g_free(given);
+                               g_free((char*)given);
                        }
                        return SASL_BADAUTH;
                }