From: Richard Russon <rich@flatcap.org>
Date: Fri, 18 Jan 2019 01:47:49 +0000 (+0000)
Subject: standardise naming in FgetConv
X-Git-Tag: 2019-10-25~372^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab2799df7d58ce94337c8da3e3d264d70cf34ddf;p=neomutt

standardise naming in FgetConv
---

diff --git a/mutt/charset.c b/mutt/charset.c
index a25e3c960..b45265046 100644
--- 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 5fbe72d5f..d51410741 100644
--- 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;
 };