change int to size_t

Author: Peter McCluskey

src/parse.c

@@ -48,6 +48,10 @@
 #include <sys/dir.h>
 #endif
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 /*
 ** LCC doesn't have lstat() defined in sys/stat.h.  We'll define it
 ** in lcc_extras.h, but really it just calls stat().
@@ -862,7 +866,7 @@ static char *mdecodeRFC2047(char *string, int length, char *charsetsave)
 
 #ifdef HAVE_ICONV
 	      char *orig2,*output2,*output3;
-	      int len;
+	      size_t len;
 	      orig2=output2=malloc(strlen(string)+1);
 	      memset(output2,0,strlen(string)+1);
 	      old_output=output;
@@ -3103,7 +3107,7 @@ int parse_old_html(int num, struct emailinfo *ep, int parse_body,
 #if HAVE_ICONV
 	if (charset){
 	  char *tmpptr;
-	  int tmplen=0;
+	  size_t tmplen=0;
 	  tmpptr=subject;
 	  subject=i18n_convstring(tmpptr,charset,"UTF-8",&tmplen);
 	  if(tmpptr)

src/print.c

@@ -46,6 +46,10 @@
 #endif
 #endif
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 static char *indextypename[NO_INDEX];
 
 #ifdef GDBM
@@ -1412,7 +1416,7 @@ void print_headers(FILE *fp, struct emailinfo *email, int in_thread_file)
   fprintf(fp, "<address class=\"headers\">\n");
 
 #ifdef HAVE_ICONV
-  int tmplen;
+  size_t tmplen;
   char *tmpsubject=i18n_convstring(email->subject,"UTF-8",email->charset,&tmplen);
   char *tmptmpname=i18n_convstring(email->name,"UTF-8",email->charset,&tmplen); 
   char *tmpname=convchars(tmptmpname,"utf-8");
@@ -2040,7 +2044,7 @@ void writearticles(int startnum, int maxnum)
     char *ptr;
 #ifdef HAVE_ICONV
     char *localsubject=NULL,*localname=NULL;
-    int convlen=0;
+    size_t convlen=0;
 #endif
 
 

src/proto.h

@@ -93,7 +93,7 @@ void dump_config(void);
 /*
 ** string.c functions
 */
-char *i18n_convstring(char *, char *, char *, int *);
+char *i18n_convstring(char *, char *, char *, size_t *);
 char *i18n_utf2numref(char *, int);
 char *i18n_numref2utf(char *);
 

src/string.c

@@ -28,6 +28,10 @@
 #include "parse.h"
 #include "uconvert.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 /* I18N hack */
 #ifdef HAVE_ICONV_H
 #include <iconv.h>
@@ -93,9 +97,9 @@ char *i18n_canonicalize_charset(char *cs){
 }
 
 
-char *i18n_convstring(char *string, char *fromcharset, char *tocharset, int *len){
+char *i18n_convstring(char *string, char *fromcharset, char *tocharset, size_t *len){
 
-  int origlen,strleft,bufleft;
+  size_t origlen,strleft,bufleft;
   char *convbuf,*origconvbuf;
   iconv_t iconvfd;
   size_t ret;
@@ -1226,7 +1230,7 @@ char *makemailcommand(char *mailcommand, char *email, char *id, char *subject)
   free(newcmd2);
 
   /* put subject */
-  if (strlen(subject)>0){
+  if (subject && strlen(subject)>0){
     newcmd2 = replace(newcmd, "$SUBJECT", convsubj);
   }else{
     newcmd2 = replace(newcmd, "$SUBJECT", "");