Rocco Rutte:

- fix some compiler warnings/protos incl. pop/ stuff

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@418 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/charset.c b/charset.c
index de6c5c9..4f5700d 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -609,7 +609,7 @@ int mutt_convert_nonmime_string (char **ps)
 
   for (c = AssumedCharset; c; c = c1 ? c1 + 1 : 0) {
     char *u = *ps;
 
   for (c = AssumedCharset; c; c = c1 ? c1 + 1 : 0) {
     char *u = *ps;

-    char *s;
+    char *s = NULL;

     char *fromcode;
     size_t m, n;
     size_t ulen = str_len (*ps);
     char *fromcode;
     size_t m, n;
     size_t ulen = str_len (*ps);

diff --git a/crypt-gpgme.h b/crypt-gpgme.h
index abe3487..c630053 100644 (file)
--- a/crypt-gpgme.h
+++ b/crypt-gpgme.h
@@ -40,6 +40,8 @@ BODY *smime_gpgme_sign_message (BODY * a);
 int pgp_gpgme_verify_one (BODY * sigbdy, STATE * s, const char *tempfile);
 int smime_gpgme_verify_one (BODY * sigbdy, STATE * s, const char *tempfile);
 
 int pgp_gpgme_verify_one (BODY * sigbdy, STATE * s, const char *tempfile);
 int smime_gpgme_verify_one (BODY * sigbdy, STATE * s, const char *tempfile);
 

+int smime_gpgme_verify_sender (HEADER* h);
+

 int pgp_gpgme_send_menu (HEADER * msg, int *redraw);
 int smime_gpgme_send_menu (HEADER * msg, int *redraw);
 
 int pgp_gpgme_send_menu (HEADER * msg, int *redraw);
 int smime_gpgme_send_menu (HEADER * msg, int *redraw);
 

diff --git a/pop/pop.c b/pop/pop.c
index 01f8e93..f53f76a 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -106,6 +106,11 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
     {
       mutt_error _("Can't write header to temporary file!");
 
     {
       mutt_error _("Can't write header to temporary file!");
 

+      break;
+    }
+  case PQ_NOT_CONNECTED:
+    {
+      mutt_error _("Can't fetch header: Not connected!");

       break;
     }
   }
       break;
     }
   }

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 1fa17ec..919a3ab 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -217,10 +217,13 @@ static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method)
     return POP_A_SUCCESS;
   case PQ_NOT_CONNECTED:
     return POP_A_SOCKET;
     return POP_A_SUCCESS;
   case PQ_NOT_CONNECTED:
     return POP_A_SOCKET;

+  case PFD_FUNCT_ERROR:
+  case PQ_ERR:
+  default:
+    break;

   }
 
   }
 

-  mutt_error _("APOP authentication failed.");
-
+  mutt_error ("%s %s", _("APOP authentication failed."), pop_data->err_msg);

   mutt_sleep (2);
 
   return POP_A_FAILURE;
   mutt_sleep (2);
 
   return POP_A_FAILURE;


@@ -271,6 +274,10 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method)
     return POP_A_SUCCESS;
   case PQ_NOT_CONNECTED:
     return POP_A_SOCKET;
     return POP_A_SUCCESS;
   case PQ_NOT_CONNECTED:
     return POP_A_SOCKET;

+  case PFD_FUNCT_ERROR:
+  case PQ_ERR:
+  default:
+    break;

   }
 
   mutt_error ("%s %s", _("Login failed."), pop_data->err_msg);
   }
 
   mutt_error ("%s %s", _("Login failed."), pop_data->err_msg);

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 8e667ad..5e72d0c 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -16,7 +16,7 @@
 #include "mx.h"
 #include "url.h"
 #include "pop.h"
 #include "mx.h"
 #include "url.h"
 #include "pop.h"

-#ifdef USE_SSL
+#if defined (USE_SSL) || defined (USE_GNUTLS)

 # include "mutt_ssl.h"
 #endif
 
 # include "mutt_ssl.h"
 #endif
 

diff --git a/sendlib.c b/sendlib.c
index 05191c9..6ae0b6b 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -805,7 +805,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
   CONTENT *info;
   CONTENT_STATE state;
   FILE *fp = NULL;
   CONTENT *info;
   CONTENT_STATE state;
   FILE *fp = NULL;

-  char *fromcode;
+  char *fromcode = NULL;

   char *tocode;
   char buffer[100];
   char chsbuf[STRING];
   char *tocode;
   char buffer[100];
   char chsbuf[STRING];