standardise naming in FgetConv

diff --git a/mutt/charset.c b/mutt/charset.c
index a25e3c9605f20eec13c225644f28133de964ab3d..b452650461d4745f73cd76cd9531b0ed9cc9677d 100644 (file)
--- a/mutt/charset.c
+++ b/mutt/charset.c
@@ -835,7 +835,7 @@ struct FgetConv *mutt_ch_fgetconv_open(FILE *file, const char *from, const char
   }
   else
     fc = mutt_mem_malloc(sizeof(struct FgetConvNot));
-  fc->file = file;
+  fc->fp = file;
   fc->cd = cd;
   return fc;
 }
@@ -866,7 +866,7 @@ int mutt_ch_fgetconv(struct FgetConv *fc)
   if (!fc)
     return EOF;
   if (fc->cd == (iconv_t) -1)
-    return fgetc(fc->file);
+    return fgetc(fc->fp);
   if (!fc->p)
     return EOF;
   if (fc->p < fc->ob)
@@ -896,7 +896,7 @@ int mutt_ch_fgetconv(struct FgetConv *fc)
   if (fc->ibl)
     memcpy(fc->bufi, fc->ib, fc->ibl);
   fc->ib = fc->bufi;
-  fc->ibl += fread(fc->ib + fc->ibl, 1, sizeof(fc->bufi) - fc->ibl, fc->file);
+  fc->ibl += fread(fc->ib + fc->ibl, 1, sizeof(fc->bufi) - fc->ibl, fc->fp);
 
   /* Try harder this time to convert some */
   if (fc->ibl)

diff --git a/mutt/charset.h b/mutt/charset.h
index 5fbe72d5f65e1ac852af08ad0080c2ddce899319..d51410741fee6e1ed4f71bd6b3ef6e60b62cb219 100644 (file)
--- a/mutt/charset.h
+++ b/mutt/charset.h
@@ -40,7 +40,7 @@ extern wchar_t ReplacementChar;
  */
 struct FgetConv
 {
-  FILE *file;
+  FILE *fp;
   iconv_t cd;
   char bufi[512];
   char bufo[512];
@@ -56,7 +56,7 @@ struct FgetConv
  */
 struct FgetConvNot
 {
-  FILE *file;
+  FILE *fp;
   iconv_t cd;
 };