[PATCH] clean up minor compiler warnings

[Andrew Gaul <andrew@xxxxxxxx>]

Attached is a patch that cleans up a few minor compiler warnings.

charset.c:
    bogus string concatenation
muttlib.c:
    signedness fix up
globals.h, protos.h, rfc822.h:
    redundant declaration

-- 
Andrew Gaul
http://gaul.org/

Index: charset.c
===================================================================
RCS file: /home/roessler/cvs/mutt/charset.c,v
retrieving revision 3.14
diff -u -p -r3.14 charset.c
--- charset.c   27 Feb 2007 17:44:08 -0000      3.14
+++ charset.c   10 Jun 2007 07:10:41 -0000
@@ -142,7 +142,7 @@ PreferredMIMENames[] = 
   { "iso-ir-157",      "iso-8859-10"   },
   { "latin6",          "iso-8859-10"   }, /* this is not a bug */
   { "l6",              "iso-8859-10"   },
-  { "csISOLatin6"      "iso-8859-10"   }, 
+  { "csISOLatin6",     "iso-8859-10"   }, 
   
   { "csKOI8r",         "koi8-r"        },
   
Index: muttlib.c
===================================================================
RCS file: /home/roessler/cvs/mutt/muttlib.c,v
retrieving revision 3.45
diff -u -p -r3.45 muttlib.c
--- muttlib.c   2 Jan 2007 17:10:34 -0000       3.45
+++ muttlib.c   10 Jun 2007 07:10:41 -0000
@@ -537,7 +537,7 @@ char *mutt_gecos_name (char *dest, size_
     if (dest[idx] == '&')
     {
       memmove (&dest[idx + pwnl], &dest[idx + 1],
-              MAX(destlen - idx - pwnl - 1, 0));
+              MAX(((int)destlen) - idx - ((int)pwnl) - 1, 0));
       memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl));
       dest[idx] = toupper ((unsigned char) dest[idx]);
     }
Index: globals.h
===================================================================
RCS file: /home/roessler/cvs/mutt/globals.h,v
retrieving revision 3.36
diff -u -p -r3.36 globals.h
--- globals.h   27 Feb 2007 17:44:08 -0000      3.36
+++ globals.h   10 Jun 2007 07:10:41 -0000
@@ -246,7 +246,6 @@ WHERE char *SmimeCryptAlg;
 WHERE short SmimeTimeout;
 WHERE char *SmimeCertificates;
 WHERE char *SmimeKeys;
-WHERE char *SmimeCryptAlg;
 WHERE char *SmimeCALocation;
 WHERE char *SmimeVerifyCommand;
 WHERE char *SmimeVerifyOpaqueCommand;
Index: protos.h
===================================================================
RCS file: /home/roessler/cvs/mutt/protos.h,v
retrieving revision 3.49
diff -u -p -r3.49 protos.h
--- protos.h    24 Feb 2007 06:37:32 -0000      3.49
+++ protos.h    10 Jun 2007 07:10:41 -0000
@@ -69,7 +69,6 @@ void mutt_generate_boundary (PARAMETER *
 void mutt_group_add_adrlist (group_t *, ADDRESS *);
 void mutt_group_context_add (group_context_t **ctx, group_t *group);
 void mutt_group_context_destroy (group_context_t **ctx);
-void mutt_group_add_adrlist (group_t *g, ADDRESS *a);
 void mutt_group_context_add_adrlist (group_context_t *ctx, ADDRESS *a);
 void mutt_delete_parameter (const char *attribute, PARAMETER **p);
 void mutt_set_parameter (const char *, const char *, PARAMETER **);
Index: rfc822.h
===================================================================
RCS file: /home/roessler/cvs/mutt/rfc822.h,v
retrieving revision 3.5
diff -u -p -r3.5 rfc822.h
--- rfc822.h    17 Sep 2005 20:46:11 -0000      3.5
+++ rfc822.h    10 Jun 2007 07:10:41 -0000
@@ -50,7 +50,6 @@ ADDRESS *rfc822_cpy_adr_real (ADDRESS *a
 ADDRESS *rfc822_append (ADDRESS **a, ADDRESS *b);
 void rfc822_write_address (char *, size_t, ADDRESS *, int);
 void rfc822_write_address_single (char *, size_t, ADDRESS *, int);
-void rfc822_free_address (ADDRESS **addr);
 void rfc822_cat (char *, size_t, const char *, const char *);
 
 extern int RFC822Error;

Attachment: pgpRLhdqC1XlS.pgp
Description: PGP signature