* Clear out some warnings given by gcc 10.

5 files changed, 7 insertions, 18 deletions

diff --git a/pith/ical.c b/pith/ical.c
index 2d61c00..7022bb5 100644
--- a/pith/ical.c
+++ b/pith/ical.c
@@ -459,7 +459,6 @@ void
 ical_free_vtimezone(void **vtzpv)
 {
   VTIMEZONE_S **vtzp = (VTIMEZONE_S **) vtzpv;
-  TZ_comp i,j;
 
   if(vtzp == NULL || *vtzp == NULL) return;
 
@@ -487,7 +486,6 @@ void
 ical_free_valarm(void **valarmpv)
 {
   VALARM_S **valarmp = (VALARM_S **) valarmpv;
-  int i, j;
 
   if(valarmp == NULL || *valarmp == NULL) return;
 
@@ -1878,7 +1876,6 @@ ical_set_date(ICLINE_S *icl, VTIMEZONE_S *vtz)
    ICAL_PARAMETER_S *param;
    char *tz = NULL;
    struct tm ic_date;
-   time_t t;
 
    if(icl == NULL) return;
 
@@ -2183,7 +2180,6 @@ ical_vevent_summary(VCALENDAR_S *vcal)
   VEVENT_S *vevent;
   GEN_ICLINE_S *gicl;
   ICLINE_S *icl;
-  char *k;
 
   if(vcal == NULL) return NULL;
 
@@ -2542,13 +2538,13 @@ ical_vevent_summary(VCALENDAR_S *vcal)
 	   }
 	   if(*t == ','){
 		*u = '\0';
-		rv->description[i++] = cpystr(ical_decode(s, vcal->encoding));
+		rv->description[i++] = (unsigned char *) cpystr((char *) ical_decode(s, vcal->encoding));
 		s = u = t+1;
 	   } else
 		*u++ = *t;  
 	}
 	*u = '\0';
-	rv->description[i++] = cpystr(ical_decode(s, vcal->encoding));
+	rv->description[i++] = (unsigned char *) cpystr((char *) ical_decode(s, vcal->encoding));
 	rv->description[i] = NULL;
 	fs_give((void **)&v);
      } /* end of if(description) */
diff --git a/pith/mailview.c b/pith/mailview.c
index c2c7842..f032a0b 100644
--- a/pith/mailview.c
+++ b/pith/mailview.c
@@ -387,8 +387,6 @@ format_calendar_vevent(VCALENDAR_S *vcal, ATTACH_S *a, HANDLE_S **handlesp, int
 
       if(cflags & FC_SUMMARY){
 	COLOR_PAIR *lastc = NULL;
-	char numbuf[50];
-	int thisdescwid;
 	COLOR_PAIR *hdrcolor = NULL;
 
 	if((flgs & FM_DISPLAY)
@@ -508,7 +506,7 @@ format_calendar(long int msgno, BODY *body, HANDLE_S **handlesp, int flgs, int w
 
   for(a = ps_global->atmts; a->description != NULL; a++){
      if(MIME_VCALENDAR(a->body->type, a->body->subtype)){
-	b = mail_body (ps_global->mail_stream, msgno, a->number);
+	b = mail_body (ps_global->mail_stream, msgno, (unsigned char *) a->number);
 	if(b == NULL){
 	   gf_puts(_("Error fetching calendar body part"), pc);
 	   gf_puts(NEWLINE, pc);
@@ -524,7 +522,7 @@ format_calendar(long int msgno, BODY *body, HANDLE_S **handlesp, int flgs, int w
 	  rawtext[callen] = '\0';	/* chop off cookie */
 	  switch(b->encoding){
 	     case ENCBASE64:
-		caltext = rfc822_base64(rawtext, strlen(rawtext), &callen);
+		caltext = rfc822_base64((unsigned char *) rawtext, strlen(rawtext), &callen);
 		if(caltext == NULL){
 		  gf_puts(_("Error in calendar base64 encoding"), pc);
 		  gf_puts(NEWLINE, pc);
diff --git a/pith/save.c b/pith/save.c
index fe7f974..fb53322 100644
--- a/pith/save.c
+++ b/pith/save.c
@@ -1721,10 +1721,8 @@ save_ex_explain_parts(struct mail_bodystruct *body, int depth, long unsigned int
 int
 save_ex_output_text(char *text, int depth, unsigned long *len, gf_io_t pc)
 {
-   int starti, i, j, startpos, pos, rv;
-   int line_len = 68 - depth;
+   int starti, i, startpos, pos, rv;
    char tmp[100];	/* a number bigger than 68, we justify text here. */
-   char *s;
    unsigned long ilen;
 
    rv = 0;
@@ -1735,7 +1733,7 @@ save_ex_output_text(char *text, int depth, unsigned long *len, gf_io_t pc)
      startpos = pos;
      for(starti = i = depth; i < 68 && text[pos] != '\0'; i++, pos++){
 	tmp[i] = text[pos];
-	if(tmp[i] == ' '){				/* save when we reach a space */
+	if(tmp[i] == ' '){	/* save when we reach a space */
 	   starti = i;
 	   startpos = pos;
 	}
diff --git a/pith/smime.c b/pith/smime.c
index 72801cd..16d7299 100644
--- a/pith/smime.c
+++ b/pith/smime.c
@@ -2768,7 +2768,6 @@ smime_extract_and_save_cert(PKCS7 *p7)
     X509 *x, *cert;
     char **email;
     int i, j, rv, already_saved;
-    long error;
 
     /* any signers for this message? */
     if((signers = PKCS7_get0_signers(p7, NULL, 0)) == NULL)
@@ -3263,7 +3262,6 @@ decrypt_file(char *fp, int *rv, PERSONAL_CERT *pc)
   PKCS7 *p7 = NULL;
   char *text, *tmp;
   BIO *in = NULL, *out = NULL;
-  int i, j;
   long unsigned int len;
   void *ret;
 
diff --git a/pith/smkeys.c b/pith/smkeys.c
index 760c4b1..024c824 100644
--- a/pith/smkeys.c
+++ b/pith/smkeys.c
@@ -201,7 +201,7 @@ ALPINE_self_signed_certificate(char *template, int version, char *pathdir, char
 	if((req = X509_REQ_new()) != NULL
 	    && X509_REQ_set_version(req, 0L)){
 	    name = X509_REQ_get_subject_name(req);
-	    X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, "Password File Certificate and Key Pair", -1, -1, 0);
+	    X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (unsigned char *) "Password File Certificate and Key Pair", -1, -1, 0);
 	    if(X509_REQ_set_pubkey(req, pkey)
 		&& (pcert = X509_new()) != NULL){
 		if(X509_set_version(pcert, version)
@@ -241,7 +241,6 @@ ALPINE_self_signed_certificate(char *template, int version, char *pathdir, char
 	    build_path(tmp, pathdir, certfile, sizeof(tmp));
 	    if((fp = fopen(tmp, "w")) != NULL
 		&&(out = BIO_new_fp(fp, BIO_FP_TEXT)) != NULL){
-	      EVP_PKEY *tpubkey = X509_REQ_get0_pubkey(req);
 	      PEM_write_bio_X509(out, pcert);
 	      BIO_flush(out);
 	      BIO_free(out);