Use p_new instead of xmalloc()

[apps/madmutt.git] / pgppubring.c

diff --git a/pgppubring.c b/pgppubring.c
index cbac932..d7e5612 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -773,9 +773,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
 
     FGETPOS (rfp, pos);
   }
-
-  fclose (rfp);
-
+  m_fclose(&rfp);
 }
 
 static void print_userid (const char *id)
@@ -898,13 +896,3 @@ static void pgpring_dump_keyblock (pgp_key_t p)
     }
   }
 }
-
-/*
- * The mutt_gettext () defined in gettext.c requires iconv,
- * so we do without charset conversion here.
- */
-
-char *mutt_gettext (const char *message)
-{
-  return (char *) message;
-}